OSDN Git Service

am c9cd45b3: (-s ours) am d857f776: Merge "Import translations. DO NOT MERGE" into...
authorYing Wang <wangying@google.com>
Wed, 27 Jun 2012 19:35:31 +0000 (12:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Jun 2012 19:35:31 +0000 (12:35 -0700)
* commit 'c9cd45b321a834d20629ff9dc91fec2ccce79f7c':
  Import translations. DO NOT MERGE


Trivial merge