diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-03 17:06:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 17:06:11 +0000 |
| commit | 070dd6249a678877dc278a45218532c12177f0b5 (patch) | |
| tree | 09644b0163bb7f9d381418a0180fc2ddaa888ffa /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d01f6e3958fe03ad175223bdec2f42aa2532eddc (diff) | |
| parent | 47c641706de92e60eaa1ea255109ced0b4c910ce (diff) | |
[automerger skipped] Merge "Disable Bluetooth if BLE was disabled while enabling" am: b101411b95 am: 47c641706d -s ours
am skip reason: Change-Id I4f92581465de81ffe9b45fb042b5cc43e5ab4136 with SHA-1 f7065dc952 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322638
Change-Id: If707da936de76328e1c4c675ddfc001cd90ef2a6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions