summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorZach Johnson <zachoverflow@google.com>2018-03-23 21:03:04 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-23 21:03:04 +0000
commit31595b3156ece8ffde45cb86c2f5d65df099cbbf (patch)
tree4875c04b7d5edd0d9ccf9bb180eb1d0460bd6a2f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentde5b6e524eb0e9ae8a40b2febbc84345a21e8ce1 (diff)
parent5bdf06353798f13ceb40c21b023e3fcfb17ad0ad (diff)
Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev
am: 5bdf063537 Change-Id: I195b1f1da0cd8e94fe1f575cae1c1b052d46ed4a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions