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