OSDN Git Service

am 52ebe172: (-s ours) am edd7ca48: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:11:07 +0000 (17:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:11:07 +0000 (17:11 +0000)
commit9de5f5bdefc094afec6846cd49287bdcba0c6dd7
treebb5c3abaa2dc3ad48c8c8fe5b5814063b5b82f26
parentc8277c87e95568fa828af6fda1ad37f371341ea1
parent52ebe172a7ab26fa9513393c277ea19c8c43fa3c
am 52ebe172: (-s ours) am edd7ca48: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '52ebe172a7ab26fa9513393c277ea19c8c43fa3c':
  Import translations. DO NOT MERGE