summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorJon Larimer <jlarimer@google.com>2015-01-29 18:00:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-29 18:00:55 +0000
commitd0318a63e51107d5589d8970b079c27d8f788c5a (patch)
treef59868aa4d58b7e081a06220e726206b40f65960 /core/java/android/widget/TextView.java
parent01287549ad415c51377683696eb37c362d43061a (diff)
parent7dd12d7633663c7f5802bdaaf8e7232a48aba811 (diff)
downloadframeworks_base-d0318a63e51107d5589d8970b079c27d8f788c5a.zip
frameworks_base-d0318a63e51107d5589d8970b079c27d8f788c5a.tar.gz
frameworks_base-d0318a63e51107d5589d8970b079c27d8f788c5a.tar.bz2
am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '7dd12d7633663c7f5802bdaaf8e7232a48aba811': DO NOT MERGE Restore calling identity before checking permission
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions