OSDN Git Service

am d8296c0e: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:09:39 +0000 (14:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:09:39 +0000 (14:09 +0000)
* commit 'd8296c0e192b71603b3a473cfc696ccfffb04162':
  Import translations. DO NOT MERGE


Trivial merge