summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorLucas Lin <lucaslin@google.com>2021-08-13 22:09:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-13 22:09:49 +0000
commit4177806ff2db240342d70c81b7ea8be8c548f497 (patch)
treeb61a52d9b167f344962dff10f9bdc33cd55df0c0 /core/java/android/widget/TextView.java
parentea9376a40a006b597a4f2716bffdc4ba7128335f (diff)
parent78a8f3423e5598c6562fcc91934c92be79194fa2 (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 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: Ia84e913ccf43eafe726cb59e5e64ad46738407b9
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions