diff options
| author | 2022-08-15 11:53:21 +0000 | |
|---|---|---|
| committer | 2022-08-15 11:53:21 +0000 | |
| commit | 1f38250dcdda455eb7ebcc8403d5e0d66665ebb3 (patch) | |
| tree | e90c5942c952b091dd451f7a05548f38f5a6c39b /libs/androidfw/StringPool.cpp | |
| parent | 96fe1b0865c7fb03f6c1334d403a4064edbbf7d5 (diff) | |
| parent | fbce91828a0aec56a6f2dec73563b3eda8703dc7 (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: c0994ae1c9 -s ours am: 5d8583773a -s ours am: 2e886b1bbc -s ours am: 07dab0c685 -s ours am: fbce91828a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507
Change-Id: I42235ea8c8bc497e34169797cb77e3f85f0da704
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