OSDN Git Service

am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import translations...
authorJustin Ho <justinho@google.com>
Fri, 10 Feb 2012 18:19:59 +0000 (10:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:19:59 +0000 (10:19 -0800)
commit164bd217f574f68e9f3b03ed59b34842cacf4ca5
tree574be6c3e7b532fe3453d186ffb8f228801d134d
parentb09b9bd0af11a5985c8854e9161c8e0a9637486f
parent35659b2c06a70381b462f1e7029eda13aa5e97d6
am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit '35659b2c06a70381b462f1e7029eda13aa5e97d6':