OSDN Git Service

am 2ccc33c5: (-s ours) am 5da10d94: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:10:54 +0000 (17:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:10:54 +0000 (17:10 +0000)
commit7650618a60452e0c14835f811450205bda38762d
treebb5c3abaa2dc3ad48c8c8fe5b5814063b5b82f26
parentb69b44c9e89f6c4c1c5298b60f33c27805d48fac
parent2ccc33c5449a05892a41e0f6a12cbf43fba2f463
am 2ccc33c5: (-s ours) am 5da10d94: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2ccc33c5449a05892a41e0f6a12cbf43fba2f463':
  Import translations. DO NOT MERGE