OSDN Git Service

am 2865ce0e: (-s ours) am 09495631: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:11:01 +0000 (17:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:11:01 +0000 (17:11 +0000)
commitc8277c87e95568fa828af6fda1ad37f371341ea1
treebb5c3abaa2dc3ad48c8c8fe5b5814063b5b82f26
parent7650618a60452e0c14835f811450205bda38762d
parent2865ce0e85c4b9b969de9d08a22710ddd4eb5373
am 2865ce0e: (-s ours) am 09495631: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2865ce0e85c4b9b969de9d08a22710ddd4eb5373':
  Import translations. DO NOT MERGE