| commit | 6e1514c3b5b5ccf5d7360552baf4136c9bf04158 | [log] [tgz] |
|---|---|---|
| author | Ganesh Olekar <olekarg@google.com> | Mon Aug 15 11:08:55 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 15 11:08:55 2022 +0000 |
| tree | 67922affb514fc0c94a141708bc22e424e379597 | |
| parent | e2f3821ed7ef0f629bc44dd0f33986ee6b6e8c78 [diff] | |
| parent | a9c783eff82d84854842e6bbe9af5215922b13b4 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507 Change-Id: I23afead6b439298ba8c0404e780d89718a5a67c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>