diff options
| author | 2022-08-15 11:53:32 +0000 | |
|---|---|---|
| committer | 2022-08-15 11:53:32 +0000 | |
| commit | 5d5b5196db585383e6356a266a2ec11db273b61c (patch) | |
| tree | e90c5942c952b091dd451f7a05548f38f5a6c39b /libs/androidfw/StringPool.cpp | |
| parent | 1f38250dcdda455eb7ebcc8403d5e0d66665ebb3 (diff) | |
| parent | f0c41b828c8cccf2b60a1a9e1c27bebe05dd2d90 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours am: e0cb2beeae -s ours am: 191abef1fa -s ours am: 108fb60e32 -s ours am: 516b24e8bd -s ours am: ebcf70b06f -s ours am: f0c41b828c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410
Change-Id: I5d37c63c624fcd0fa709f580dc4ce07908f2938d
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