OSDN Git Service

am 6e639eec: (-s ours) am f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 14:59:11 +0000 (14:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 14:59:11 +0000 (14:59 +0000)
commitba648051abb05b17a9739532da894441e3e27caf
treee7817a4f5317704d7fdcefaeb9a48a6f35397795
parent7d49ed8ac25426dcdeb7a022bab421ba3152d430
parent6e639eec1211977e521189b1a00be28f4c1def2a
am 6e639eec: (-s ours) am f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '6e639eec1211977e521189b1a00be28f4c1def2a':
  Import translations. DO NOT MERGE