summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorBen Komalo <benkomalo@google.com>2011-09-19 16:55:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-19 16:55:54 -0700
commit70a85687b5fae5a28bc786aa5729e87202447fa3 (patch)
tree29e8489a3af698732b3e878b3905b3593e065f14 /core/java/android/widget/TextView.java
parent4b5441a7201a2f28becf3ab7fb33694f137e1998 (diff)
parent85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f (diff)
downloadframeworks_base-70a85687b5fae5a28bc786aa5729e87202447fa3.zip
frameworks_base-70a85687b5fae5a28bc786aa5729e87202447fa3.tar.gz
frameworks_base-70a85687b5fae5a28bc786aa5729e87202447fa3.tar.bz2
am 85a61c4d: Merge "Only run "core" apps when encrypting device." into ics-factoryrom
* commit '85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f': Only run "core" apps when encrypting device.
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions