diff options
| author | 2022-08-15 11:25:36 +0000 | |
|---|---|---|
| committer | 2022-08-15 11:25:36 +0000 | |
| commit | f001e16efd60fe370a8c97c0c8995826eb09f11a (patch) | |
| tree | e64a79813aa06eaddef21d309dd0bb0669e1fa13 /libs/androidfw/ResourceTimer.cpp | |
| parent | 5b41713cbcd8e67bf4f24647e8cf3d8403d0789d (diff) | |
| parent | 07dab0c6858d4c87383bec11cef48e91e49bbae2 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507
Change-Id: I5655e781bec3de7527a0449c6053b73f017d553a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions