diff options
| author | Ganesh Olekar <olekarg@google.com> | 2022-08-15 10:49:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-15 10:49:03 +0000 |
| commit | a9c783eff82d84854842e6bbe9af5215922b13b4 (patch) | |
| tree | 16a6d091d958cac7594cfb1569a0a9b27f115a71 /core/java/android/widget/TextView.java | |
| parent | 84ffde6aee020830fc812a712f8d2d17c5fffab8 (diff) | |
| parent | c0994ae1c9c799a8551d3f0b0dad7ba6290b5507 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507
Change-Id: I78650b8623fa87e0aa2ed93ca9efa61443fb902b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions