diff options
| author | 2022-08-15 11:25:19 +0000 | |
|---|---|---|
| committer | 2022-08-15 11:25:19 +0000 | |
| commit | eb08fd3d2f19a4c8cb8bc95926e8e7a0c46e16ce (patch) | |
| tree | e64a79813aa06eaddef21d309dd0bb0669e1fa13 /libs/androidfw/ResourceTimer.cpp | |
| parent | 806cd40238586c4eb1b374d4150052f27bcecb41 (diff) | |
| parent | 6e1514c3b5b5ccf5d7360552baf4136c9bf04158 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507
Change-Id: I64f779c330286141c5d0a8e481fba778559b07f9
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