diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 02:03:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 02:03:39 +0000 |
| commit | 26ce55d8bfbf969e6f15a2ac215050ca98cd576e (patch) | |
| tree | 0c289bb104102ba92719262ae06ae513b171fe18 /core/java/android/widget/TextView.java | |
| parent | 1e786fdd5cbe157d267f1bb6127f5a77b5173458 (diff) | |
| parent | ce01e4a1a90d5594a838ef44b126e70946ea08c3 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into pi-dev am: 44dc2b273b -s ours am: 34709e93e6 -s ours am: 36fbfc6d1a -s ours am: 01a542b340 -s ours am: 5d9e072094 -s ours am: 93ad5f4560 -s ours am: a7beee21fb -s ours am: 469f78b5b9 -s ours am: ce01e4a1a9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: Idb025343e9344197186e99a935e5506dbe848314
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions