diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 01:09:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 01:09:26 +0000 |
| commit | 7f508f647bb09d9fcd9709192c67ad16d0f79adb (patch) | |
| tree | b9312b5ed938962344fdd195c9b311a7842fc64c /core/java/android/widget/TextView.java | |
| parent | abcfa2ce23a838f61f620aaec3fac4d4146b029e (diff) | |
| parent | 93ad5f4560bd61dfbef722a4081db1b97f32e3d3 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: Ia601230e88319dc7c2d48a7fd3aed40e2c0d3823
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions