OSDN Git Service

am 730a73da: (-s ours) am cf80d7c4: (-s ours) am 723c5b38: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 11 Sep 2015 16:40:01 +0000 (16:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Sep 2015 16:40:01 +0000 (16:40 +0000)
commit5215f65c167fbe0814155273a0c4348cc8dac2f4
tree0622e8336f0ce61ad4c6b5f98b2a4d4a8ba6da06
parent908243c3ea91bfb2a317daa5fe668006c717a62f
parent730a73daace1bafb86eeceb79b6d623d2feab2d9
am 730a73da: (-s ours) am cf80d7c4: (-s ours) am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '730a73daace1bafb86eeceb79b6d623d2feab2d9':
  Import translations. DO NOT MERGE