OSDN Git Service

am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 16:19:49 +0000 (16:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 16:19:49 +0000 (16:19 +0000)
commitd1a87a4a39d588ed320df69dde741968cb41da20
tree64f76f38196a154512543f1d0ca563203d99b604
parent90c48a4134af1c654c975369f00e497799fece38
parentd0249808fd8c1dd98b2cbe028a0448fda2e129ec
am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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