OSDN Git Service

am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
authorGeoff Mendal <mendal@google.com>
Wed, 5 Aug 2015 16:29:05 +0000 (16:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Aug 2015 16:29:05 +0000 (16:29 +0000)
* commit 'e229337b34a92f99ed25f92479753e9dfd113a96':
  Import translations. DO NOT MERGE


Trivial merge