diff options
| author | Ganesh Olekar <olekarg@google.com> | 2022-08-15 11:08:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-15 11:08:54 +0000 |
| commit | 2e886b1bbca1e8a571c0f127f5a27acb242e72f6 (patch) | |
| tree | 4ca433b226945b781075c8c66f626f93927dd721 /core/java/android/widget/TextView.java | |
| parent | 01d360f8728491a68010e7d9c7b1d20aac4ae0ea (diff) | |
| parent | 5d8583773ae05014b1c1c7c2175acebfda712a39 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507
Change-Id: I1015d73ea115629a760d1926571462abe0e107e3
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