OSDN Git Service

am 2fc3216e: (-s ours) am facfbc52: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 17:08:46 +0000 (17:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 17:08:46 +0000 (17:08 +0000)
* commit '2fc3216e2f8b77116594ca5cda2e927c43094039':
  Import translations. DO NOT MERGE


Trivial merge