diff options
| author | 2022-08-15 11:53:31 +0000 | |
|---|---|---|
| committer | 2022-08-15 11:53:31 +0000 | |
| commit | c8aca2209f3def6cb22c532e98f3c82e325bdc3c (patch) | |
| tree | 8aff2b709297967ca39b82b8ef11c7e8fb61e627 /tools/aapt/Command.cpp | |
| parent | 9b6000be563dd14532d857efcc827120c45a6b91 (diff) | |
| parent | 1c331ff651983b1b3c84daac5b5b0dc5d0789f28 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours am: e0cb2beeae -s ours am: 191abef1fa -s ours am: 108fb60e32 -s ours am: 516b24e8bd -s ours am: ebcf70b06f -s ours am: 1c331ff651 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410
Change-Id: I3414f402d4d586a52deacda7d99f7a9d69335702
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