diff options
| author | 2022-08-15 11:25:28 +0000 | |
|---|---|---|
| committer | 2022-08-15 11:25:28 +0000 | |
| commit | 5b41713cbcd8e67bf4f24647e8cf3d8403d0789d (patch) | |
| tree | e64a79813aa06eaddef21d309dd0bb0669e1fa13 /libs/androidfw/ResourceTimer.cpp | |
| parent | eb08fd3d2f19a4c8cb8bc95926e8e7a0c46e16ce (diff) | |
| parent | 727120aa1fef6917b51c401aa132bcc25d74b5df (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: 1dd4d7a13b -s ours am: 727120aa1f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410
Change-Id: I4298649b114cf929547e79511048a32019def666
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