summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorLucas Lin <lucaslin@google.com>2021-08-15 02:16:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-15 02:16:22 +0000
commitda41c338712b1594824617a67e72215363c4e91b (patch)
treed0f0f8144eb53a63b4ececfbecc0008b3df5b047 /core/java/android/widget/TextView.java
parent1f093b2bb66588461d285480859f215a202c9841 (diff)
parent7692fa97cd8c2df6b89d08e0e4df060a15cfd1a8 (diff)
[automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: d28527a3fe -s ours am: ba72ebb1ea -s ours am: 78a8f3423e -s ours am: 4177806ff2 -s ours am: 7692fa97cd -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: I0184c7efd59e437dfa2e3215bf3d6e73799e16bc
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions