diff options
| author | 2022-08-15 10:50:11 +0000 | |
|---|---|---|
| committer | 2022-08-15 10:50:11 +0000 | |
| commit | 5d8583773ae05014b1c1c7c2175acebfda712a39 (patch) | |
| tree | 6f72e318a762569e9a71e6131c05a918e59d9e90 /libs/androidfw/StringPool.cpp | |
| parent | e43ee48e5d2a1867f02e92f18e3e4e42ba2dcc74 (diff) | |
| parent | c0994ae1c9c799a8551d3f0b0dad7ba6290b5507 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507
Change-Id: Ib4acc617fbcbf2d02649878facb975d5d34d52d0
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