diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-02 18:16:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-02 18:16:37 +0000 |
| commit | 83eb446813f952c6374b9a04c0bb2ec405bd2caf (patch) | |
| tree | 0ecad090a8650c68d57f28f2e0ab468430573e33 /core/java/android/widget/TextView.java | |
| parent | dedc78fe1426d60f139a378f31c29fcbd4e37907 (diff) | |
| parent | cd803c32a9fa18314160a823f57374f3d0855259 (diff) | |
Merge "[automerger skipped] Merge "AndroidRuntime: pass odsign verification status to ART" into sc-dev am: f5ee8cf3b8 -s ours am: 2ab08c026c -s ours" into sc-v2-dev-plus-aosp am: cd803c32a9 -s ours
am skip reason: Merged-In I772b5b7b191310bf7c7797161a304a1ab6f53c5e with SHA-1 a8b24392a1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15175172
Change-Id: Ieddb053364d1af7c3d1e8dc1b5f1ef72dffa4f9a
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions