OSDN Git Service

am 40e3b4b5: (-s ours) am 76b8b1e6: (-s ours) am 78b6e6c7: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 22:57:51 +0000 (22:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:57:51 +0000 (22:57 +0000)
commit33c8f11ea9dafef34bd4d41016ad7c74970cf557
tree32cc562acb5bfa2895d0109133a0daeb1d0da0b6
parent25cc56544ca9f62a96f42b108c8d01e0d4ed2872
parent40e3b4b5c10dbde39486a30bf37d13bf1464dfa5
am 40e3b4b5: (-s ours) am 76b8b1e6: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '40e3b4b5c10dbde39486a30bf37d13bf1464dfa5':
  Import translations. DO NOT MERGE