diff options
| author | 2022-08-15 11:52:29 +0000 | |
|---|---|---|
| committer | 2022-08-15 11:52:29 +0000 | |
| commit | 22683c5be2b9fba08366eff84e742b700aeb68c1 (patch) | |
| tree | 8aff2b709297967ca39b82b8ef11c7e8fb61e627 /tools/aapt2/LoadedApk.cpp | |
| parent | cb2ec7b31dfb53ac70f189eb2db2aeef4c00e42f (diff) | |
| parent | eb08fd3d2f19a4c8cb8bc95926e8e7a0c46e16ce (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: eb08fd3d2f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507
Change-Id: I095fb8af3fe476f5a91228529c933b264ed31532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/LoadedApk.cpp')
0 files changed, 0 insertions, 0 deletions