OSDN Git Service

am edd7ca48: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
authorGeoff Mendal <mendal@google.com>
Sun, 31 May 2015 03:03:10 +0000 (03:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 31 May 2015 03:03:10 +0000 (03:03 +0000)
* commit 'edd7ca48004796ee37b96e90e479b1d42c8ea2d3':
  Import translations. DO NOT MERGE


Trivial merge