OSDN Git Service

am 65b1230e: (-s ours) am 66daca6b: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Mon, 16 Jul 2012 21:30:45 +0000 (14:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Jul 2012 21:30:45 +0000 (14:30 -0700)
* commit '65b1230ea9829246d2bc8073974440a3a49af55c':
  Import translations. DO NOT MERGE


Trivial merge