OSDN Git Service

am f8db2d7c: (-s ours) am d048f87a: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:11:18 +0000 (17:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:11:18 +0000 (17:11 +0000)
commite7fc3ccdfbcfb5ec0013294b347b4c55403d9cd7
treebb5c3abaa2dc3ad48c8c8fe5b5814063b5b82f26
parentcc5c15d7e24c7ee06920dc8ca0ccfdce1fccd722
parentf8db2d7cd09adf8ad4cd1e205c0bdfb90e8af76f
am f8db2d7c: (-s ours) am d048f87a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f8db2d7cd09adf8ad4cd1e205c0bdfb90e8af76f':
  Import translations. DO NOT MERGE