diff options
| author | 2022-01-07 19:46:08 +0000 | |
|---|---|---|
| committer | 2022-01-07 19:46:08 +0000 | |
| commit | 1e2a3ecc4d00e75f8e1d197d1902e8824f97b377 (patch) | |
| tree | 167071a1fb8d68d44ba5869b0d1dbbb126b3941a /tools/aapt2/ResourceParser.cpp | |
| parent | 3ba0620ec63523b57151cc7702c66d9a5d0159a2 (diff) | |
| parent | 60a456a0a6fd97696f312cf2b4b16d68b4b208c6 (diff) | |
Merge changes I8cf2b091,I13c5986e,I12579263,I42635877,Ib3ff55ab into sc-v2-dev
* changes:
[DO NOT MERGE] Handle IllegalStateException in APM event handling.
DO NOT MERGE: Disable UWB in airplane mode.
DO NOT MERGE: Clear calling context when adding UWB default setting.
DO NOT MERGE: Set default UWB state on.
DO NOT MERGE: Persist UWB State in AOSP stack.
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions