tree 9773727aebc354334055955cb8183be613e63ad1
parent 9d9f23727031e3f1576bae44d0586c72842afbf3
parent 112fdf612db71a552fce063136bf2796df3b71ec
author Martijn Coenen <maco@google.com> 1307992741 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1307992741 -0700

Merge "Support for setting the NfcA transceive timeout (API)."