diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2017-01-06 19:10:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-06 19:10:22 +0000 |
| commit | bbc00c877f61252eff29c7545c298811fc4f58db (patch) | |
| tree | cef27c9116236073cb115e42703f922b66b195e0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 66602c88854b03d46079814c64742c3513b21ce4 (diff) | |
| parent | c1db6c05d03cb6e6b81bb23cc7869b4034df6883 (diff) | |
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f
am: c1db6c05d0
Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions