OSDN Git Service

am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into...
authorJustin Ho <justinho@google.com>
Fri, 10 Feb 2012 18:13:20 +0000 (10:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:13:20 +0000 (10:13 -0800)
commit35659b2c06a70381b462f1e7029eda13aa5e97d6
treee51943ff5fca9fb0c0d1d7a6cb23ed8f184b1463
parentc2bc46ea31e7ec145f11ba7a7d5f5891ad0c50ac
parent70992e04d00e6708d33adbb7c016499b6e030d68
am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit '70992e04d00e6708d33adbb7c016499b6e030d68':