| commit | 9ca9971f98569fbf5aa1e5fd38a0466c85a591a8 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 15 11:53:20 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 15 11:53:20 2022 +0000 |
| tree | aab953cb264763a6dda226daff452d977bb6fde0 | |
| parent | 8fdd8a15107527e52c0d434338ad98fbb2cd8da5 [diff] | |
| parent | 4dd93efa4d4eeae7ca985ea02ef1918de0ab8c34 [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: a9c783eff8 -s ours am: 6e1514c3b5 -s ours am: 389b814e93 -s ours" into tm-d1-dev-plus-aosp