summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMiao-chen Chou <mcchou@google.com>2018-03-16 02:41:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-16 02:41:14 +0000
commit056975fa43987a9ed46e156c84661c93a117d106 (patch)
tree66f96f018dd9089977e532b79f238cb395489b5e /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd2655378d8f2168b83482bc5d1989078612bb6df (diff)
parent158344f78a0ef9fc23a3b01a821b307da2eda6a3 (diff)
Merge "Bluetooth: preserve one advertisement slot for GMS core" am: 00cc1847d3 am: 922ae0237f
am: 158344f78a Change-Id: Ia9f4c8845bb59509482ac0af8a569026fd1d7101
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions