diff options
| author | Martijn Coenen <maco@google.com> | 2014-09-26 19:53:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 19:53:03 +0000 |
| commit | e20f9aa3168660c20360b819f21b4d138ac64f85 (patch) | |
| tree | 454e06489fd685f5569d5d254f257e7fe2db491a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ac28e40aa94ae342fdbfdb71d834093a1048ed89 (diff) | |
| parent | a751e2aa379e6b3f77d993c7fb5eecd85b1541e4 (diff) | |
am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev
* commit 'eaaa5adb4e553ca2482eb57084d077e8847ffc3e':
Add hidden API to disable NFC (optional persist).
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions