summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 02:08:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 02:08:04 +0000
commit54847c45a610c3f4e67b88f6969bf79c34b2ad84 (patch)
tree978103ba44bc26c99a087dbec21b67e8f86e43bb /tools/aapt2/java/JavaClassGenerator.cpp
parentbdfaacaad012a1716fc2c89dc8ea1c4cd292ad18 (diff)
parent8626f485c7b07ce1c99cade6d8590adb15017fc9 (diff)
Merge "Merge "Disable Bluetooth if BLE was disabled while enabling" into rvc-dev am: 6e97539ea4 am: 3e5586b2c9" into rvc-d1-dev-plus-aosp am: 8626f485c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11593908 Change-Id: I48c5d10b1c8b1226c5e2dbc264fb117170abda62
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions