diff options
| author | 2022-10-28 22:37:40 +0000 | |
|---|---|---|
| committer | 2022-10-28 22:37:40 +0000 | |
| commit | 77aa1c69833b2deafcb707946a584787020daf37 (patch) | |
| tree | f53c03f2419623c91b648d53d0c4fbb1836cb270 /libs/androidfw/ConfigDescription.cpp | |
| parent | c4a1082d5be9957f6469b7f392660431b333533b (diff) | |
| parent | 6275305f99b463c2d50db7d865c3f1d6c63e7c37 (diff) | |
Merge changes from topic "am-48e5b26bdc3542fc8619e4c0d1a59794"
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into sc-v2-dev am: 19e8834210 -s ours am: 27ee710fd2 -s ours am: 4f69ed02fa -s ours
[automerger skipped] RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am: 2509b12e6f -s ours am: 09d1406405 -s ours am: 438a418a8c -s ours
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions