diff options
author | Jack He <siyuanh@google.com> | 2019-03-27 03:34:59 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-27 03:34:59 -0700 |
commit | d50bec92f5293132ac3ba6d930856c914ce713c3 (patch) | |
tree | 963a77cc9e933184dcc0c10e67d931bd078b6869 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9f230d5e167725dba5749cb70fabdbd0b9ab968f (diff) | |
parent | 0cc9d441d6a653f3ee44beb77a1204a6f231d837 (diff) |
[automerger skipped] Merge "DO NOT MERGE Atoms: Add BluetoothClassicPairingEvent" into pi-dev am: 0c9ce0913c -s ours
am: 0cc9d441d6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie89b4f2831136ff800bc68c6cda9d80626a49319
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions