diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-25 16:17:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-03-25 16:17:13 +0000 |
commit | 97e13dbd32be75bf9b48e19e84227da06012c4b6 (patch) | |
tree | 60e38852a77a6f9d71a085f551254050c47e8e3b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6fea516344e0ca7bfbfcf6fed485142e23de3030 (diff) | |
parent | 68ce540e60cf3721472184348f7504b570018661 (diff) |
Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev
* changes:
[DO NOT MERGE] Do not allow Bluetooth enabling during device shutting down
[DO NOT MERGE] Handle SHUTDOWN Intent in BluetoothManagerService
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions