OSDN Git Service

am 205365eb: (-s ours) am 7b03d10f: (-s ours) am 21416b83: (-s ours) am 1207a501...
authorGeoff Mendal <mendal@google.com>
Wed, 30 Sep 2015 20:36:52 +0000 (20:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 20:36:52 +0000 (20:36 +0000)
commitfcb6b63fdd9edd20eb08993015821c3e0d28670a
tree8bc2b4bc224cb111c1514b66018da2cf8338ccc7
parenta3b0c07a57b8c8b7fc93a1e44ed4afa17c9a59d0
parent205365eb482dcb4ec86be53e2b073269c7aabf6a
am 205365eb: (-s ours) am 7b03d10f: (-s ours) am 21416b83: (-s ours) am 1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '205365eb482dcb4ec86be53e2b073269c7aabf6a':
  Import translations. DO NOT MERGE