diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-27 04:56:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-01-27 04:56:27 +0000 |
| commit | 7dc257bf7436eb60d8f64c316538da909351aad9 (patch) | |
| tree | 2514f1e3b1b845ddff372aa1a9c77f5360943a85 /core/java/android/widget/TextView.java | |
| parent | e484d11a5dd531fb3ec82a3d1ba3be3dc28376da (diff) | |
| parent | 8127bfd525d54f2120c9077147e3c6d1ab358055 (diff) | |
Merge changes from topic "am-9ffc56c33d6e48c9bec7223ec4f11d94" into sc-v2-dev-plus-aosp
* changes:
Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev am: d9bacad89c am: 0f36e3a1b2
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674a am: 4289a15ed3 -s ours am: eddac29061 -s ours
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions