| commit | 41d094a6dda6750cfe65694d5af031bdf4de2418 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 15 12:19:23 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 15 12:19:23 2022 +0000 |
| tree | 450c4158d19a8a85cde5dd038f2a2344ce849611 | |
| parent | 5cba07743ae88cf3b65f71f7cf21378cb13de837 [diff] | |
| parent | 22da26c680334b649545f25d9ab4da08ddf6531f [diff] |
Merge "[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: fbce91828a -s ours am: 1f38250dcd -s ours" into tm-qpr-dev-plus-aosp