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