OSDN Git Service

am 90e71542: (-s ours) am c66604cb: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Mon, 18 Jun 2012 17:52:40 +0000 (10:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Jun 2012 17:52:40 +0000 (10:52 -0700)
* commit '90e71542d1307a3b142509ee658304920d1b3f3d':
  Import translations. DO NOT MERGE


Trivial merge