OSDN Git Service

am c1e7e9b9: (-s ours) am b065a136: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 14 May 2015 09:50:31 +0000 (09:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 09:50:31 +0000 (09:50 +0000)
* commit 'c1e7e9b981312f6fb9a0b86ed85ca8ae9ab78a13':
  Import translations. DO NOT MERGE


Trivial merge