diff options
| author | 2022-08-15 11:52:51 +0000 | |
|---|---|---|
| committer | 2022-08-15 11:52:51 +0000 | |
| commit | 58abc8b18c3cf8ba9fc3ffe16accd5a1dcb2d95e (patch) | |
| tree | e90c5942c952b091dd451f7a05548f38f5a6c39b /libs/androidfw/StringPool.cpp | |
| parent | f2bca1c2b7a3a0ea8912cf11cdde6c6c63f7ab7b (diff) | |
| parent | 389b814e93d8388d2d6a4daa54be6c9270db41a4 (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: a9c783eff8 -s ours am: 6e1514c3b5 -s ours am: 389b814e93 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507
Change-Id: I17a591de9d55e68e39ab4ee3da490be70cc136bd
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