diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 03:04:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 03:04:42 +0000 |
| commit | 0a227945c8fcda117491140052dcc2d5267aa483 (patch) | |
| tree | d06db12f60335748dbcf99b414cf06d9ac416ca7 /core/java/android/widget/TextView.java | |
| parent | 7da2f1d130c6c2301f6439ff90dec6e55093c72d (diff) | |
| parent | 47e341f7ce60e3ab42d8c7b0e4d749b33be6dd5e (diff) | |
[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into qt-dev am: 204ab511e0 -s ours am: 5a1724e2ce -s ours am: 037fa26965 -s ours am: abc15657c4 -s ours am: 8ab6bd5bce -s ours am: a4c730ac18 -s ours am: 7b529e7cb5 -s ours am: 47e341f7ce -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616710
Change-Id: I17bc3635b31e6e20267e3d4c699983f5564b6a42
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions