diff options
| author | 2022-08-15 10:30:19 +0000 | |
|---|---|---|
| committer | 2022-08-15 10:30:19 +0000 | |
| commit | c0994ae1c9c799a8551d3f0b0dad7ba6290b5507 (patch) | |
| tree | 9da28ad1ecf0df0f1dd26a6a7d19906b91d65a89 /libs/androidfw/StringPool.cpp | |
| parent | 5a138031457d32868a3135aa9fa3e0f3a38fc457 (diff) | |
| parent | 6bfd59aabf4161d11be6bdc8f67b4fa0aea7f215 (diff) | |
[automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours am: 6732f3304f -s ours am: 6bfd59aabf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507
Change-Id: Icd3ec52f922427f9dff4b4385df85261185922bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions