summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-01-30 13:38:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-30 13:38:52 -0800
commitc7d7515325e9ef827feb094dbf42f1c920ad7936 (patch)
tree14942664ee0daed2933b4ba3adc4edc31535f844 /core/java/android/widget/TextView.java
parenta82173305991a24bc1400149b41bb998a6f50b38 (diff)
parent827a597df70a51c6cccad52fae2be2c469f58b77 (diff)
downloadframeworks_base-c7d7515325e9ef827feb094dbf42f1c920ad7936.zip
frameworks_base-c7d7515325e9ef827feb094dbf42f1c920ad7936.tar.gz
frameworks_base-c7d7515325e9ef827feb094dbf42f1c920ad7936.tar.bz2
am 827a597d: Reconcile with ics-mr1-release
* commit '827a597df70a51c6cccad52fae2be2c469f58b77': Revert "Fix 5797764: Increase lock screen's thread priority" DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions