| commit | e7a81e7a87dac9460eb8faa759d2c5086ccff523 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Oct 14 19:00:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 14 19:00:44 2013 -0700 |
| tree | 1cfde1d7192b262fb071f971fa186a0d1b81155e | |
| parent | 2f8079753d40e7ee3f3af0d709c83c1e42480349 [diff] | |
| parent | 47936bb8f5192496b8007009f8732a9d7194b2ac [diff] |
am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev * commit '47936bb8f5192496b8007009f8732a9d7194b2ac': NFC card emulation API docs.