OSDN Git Service

am 69ea07be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
authorGeoff Mendal <mendal@google.com>
Thu, 14 May 2015 15:15:03 +0000 (15:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 15:15:03 +0000 (15:15 +0000)
* commit '69ea07be05e062c360d103009b0ae000b520532b':
  Import translations. DO NOT MERGE


Trivial merge