OSDN Git Service

am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:01:18 +0000 (23:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:01:18 +0000 (23:01 +0000)
* commit '536ed1847863776335576699cdbe828b62f35a0f':
  Import translations. DO NOT MERGE


Trivial merge