| commit | 47936bb8f5192496b8007009f8732a9d7194b2ac | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Oct 14 17:19:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 14 17:19:49 2013 -0700 |
| tree | 5fa110fde5a0c5c321f20bee61de3db4b3d4de55 | |
| parent | f62e262932daaea8b5eda3893a56e2fdbb17ea0a [diff] | |
| parent | 7d91cc97d788aae9f3a6ac5540580cc95591e356 [diff] |
am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev * commit '7d91cc97d788aae9f3a6ac5540580cc95591e356': NFC card emulation API docs.