diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-03 17:08:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 17:08:57 +0000 |
| commit | 73da6b107961b11383aba0e55b211192666a1777 (patch) | |
| tree | b45438064b523d5babe9041f112d077255929726 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 5532b78944c369a36932a0934f2a1ebb181c61dd (diff) | |
| parent | 070dd6249a678877dc278a45218532c12177f0b5 (diff) | |
[automerger skipped] Merge "Disable Bluetooth if BLE was disabled while enabling" am: b101411b95 am: 47c641706d -s ours am: 070dd6249a -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: I68e4fcad192fe275b84509d1dbbe1ed07a5c4614
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions