summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-11-29 11:51:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-29 11:51:20 -0800
commite11ec1df421be0b1a18fd3cf6ec23361d86ca32a (patch)
tree49c0dc6ac659e69b4a2b7c4c439d60b7d759e3e6
parentaa2892edc7bb2b915771679d9811ec54a26db366 (diff)
parent47af771d708c8eb8f7debf7e295d609491f03cc8 (diff)
downloadframeworks_base-e11ec1df421be0b1a18fd3cf6ec23361d86ca32a.zip
frameworks_base-e11ec1df421be0b1a18fd3cf6ec23361d86ca32a.tar.gz
frameworks_base-e11ec1df421be0b1a18fd3cf6ec23361d86ca32a.tar.bz2
am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '47af771d708c8eb8f7debf7e295d609491f03cc8': Import revised translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions