OSDN Git Service

am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 4 May 2015 12:52:11 +0000 (12:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 12:52:11 +0000 (12:52 +0000)
* commit '577e34c9ebbf1ff09a6341e388795dec2c4fa92f':
  Import translations. DO NOT MERGE


Trivial merge