summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-11-09 23:18:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-09 23:18:10 +0000
commit6b992090f6eb1e14553be22373799258bb401e3d (patch)
treebad58cf08d5471bead520619978bb09b67d0d261 /core/java/android/widget/TextView.java
parent69db56958fdac41a093cd6cf00cbe200f2885730 (diff)
parent3124bf64404dbb90cc521abf4c7bf8d438346362 (diff)
downloadframeworks_base-6b992090f6eb1e14553be22373799258bb401e3d.zip
frameworks_base-6b992090f6eb1e14553be22373799258bb401e3d.tar.gz
frameworks_base-6b992090f6eb1e14553be22373799258bb401e3d.tar.bz2
am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '3124bf64404dbb90cc521abf4c7bf8d438346362': Import revised translations. DO NOT MERGE
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions