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