diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2019-08-06 03:28:23 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-06 03:28:23 -0700 |
| commit | 90cf683bce1451c3db14b3cd308de36518fc1d83 (patch) | |
| tree | 30a9dee09a0cac6c83d0eab50950e0467edc1145 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d5e42b6546c66a57a952536ea345dc9ac01817db (diff) | |
| parent | 1da4e635dc8e5684c6b95f35f5ba8e1361ca60ff (diff) | |
[automerger skipped] [RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction am: 9971348a0c am: 433ee38af2
am: 1da4e635dc -s ours
am skip reason: subject contains skip directive
Change-Id: I866c855abd019223e472ec3041383784e5154467
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions