diff options
author | Martijn Coenen <maco@google.com> | 2013-08-27 16:14:59 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 16:14:59 -0700 |
commit | ef97ba19581f787546ba3aa3e433af6a92cf3ebd (patch) | |
tree | 06a9b2ebe36018db26fbe422f5d2c47e9ca65e74 /tools/aidl/generate_java.cpp | |
parent | 9d345ff4cb724d54c3493c475c16b589ca8f4c13 (diff) | |
parent | 61fdf6d155a4fad1d27a7593618d29f638ea9f6a (diff) |
am 61fdf6d1: am bbbc8660: Merge "Add NFC reader-mode API." into klp-dev
* commit '61fdf6d155a4fad1d27a7593618d29f638ea9f6a':
Add NFC reader-mode API.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions