summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorLucas Lin <lucaslin@google.com>2021-08-15 02:05:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-15 02:05:18 +0000
commit9144ca7953859abefca0deb17eee5988edec0905 (patch)
treec960532f31f3889c94d12b3ad903f1a185f6ca70 /core/java/android/widget/TextView.java
parent7692fa97cd8c2df6b89d08e0e4df060a15cfd1a8 (diff)
parent1aede38566f58e5667667b55add51ae211de5a54 (diff)
[automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: c940a77495 -s ours am: 0d88bdece9 -s ours am: 778117f023 -s ours am: 1aede38566 -s ours
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347258 Change-Id: I0bd2497eaa873fc812baa5726a306e40feac7a0e
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions