OSDN Git Service

am fd7adc36: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
authorGeoff Mendal <mendal@google.com>
Wed, 8 Oct 2014 16:24:15 +0000 (16:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Oct 2014 16:24:15 +0000 (16:24 +0000)
* commit 'fd7adc36f681765db78a99f74932e6c47b3955ee':
  Import translations. DO NOT MERGE


Trivial merge