OSDN Git Service

am 6e6250b9: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 30 Mar 2015 14:49:09 +0000 (14:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 30 Mar 2015 14:49:09 +0000 (14:49 +0000)
* commit '6e6250b9613e7c236a07367fc800feece8bcd706':
  Import translations. DO NOT MERGE


Trivial merge