OSDN Git Service

am 237882f1: (-s ours) am d2dec8c7: Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Thu, 6 Sep 2012 17:57:48 +0000 (10:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 17:57:48 +0000 (10:57 -0700)
* commit '237882f1480aebe242dad3bae09a362a22a2e5a4':
  Import translations. DO NOT MERGE


Trivial merge