OSDN Git Service

am c7f4582c: (-s ours) am 2bc2a994: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 19 Jan 2015 15:05:41 +0000 (15:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Jan 2015 15:05:41 +0000 (15:05 +0000)
* commit 'c7f4582c410760105e9eac10597fd5a23257685b':
  Import translations. DO NOT MERGE


Trivial merge