OSDN Git Service

am 15aa75e3: (-s ours) am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 22:57:10 +0000 (22:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:57:10 +0000 (22:57 +0000)
commiteafe2996e76744e0c4b1de5c68cb5d43f5b8069c
tree18c580693446704f3d1e39d971c7b9d293e4c25b
parentbd7caa7c1c0c7ad871e76554975003f9be7646e5
parent15aa75e3f86f6a10512925f117240d7d2d8b291b
am 15aa75e3: (-s ours) am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '15aa75e3f86f6a10512925f117240d7d2d8b291b':
  Import translations. DO NOT MERGE