OSDN Git Service

am a6eda952: (-s ours) am a35e790d: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:10:13 +0000 (17:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:10:13 +0000 (17:10 +0000)
* commit 'a6eda952908cc9d01935937ebbcd3dd4460c48dc':
  Import translations. DO NOT MERGE


Trivial merge