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