OSDN Git Service

am 9bf1c310: (-s ours) Import translations. DO NOT MERGE automerge: f27b985 -s ours
authorGeoff Mendal <mendal@google.com>
Mon, 16 Feb 2015 17:16:47 +0000 (17:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Feb 2015 17:16:47 +0000 (17:16 +0000)
commita83708c211673f0f5b218a8f994aa82bc937d5cb
tree4077bf3e6269d5d99a03a94d6d9a6d898f42e873
parent504bdd80943fad97adaa1060457680aceabace90
parent9bf1c310132b914dcd7bb760ac68a0833374e6cb
am 9bf1c310: (-s ours) Import translations. DO NOT MERGE automerge: f27b985  -s ours

* commit '9bf1c310132b914dcd7bb760ac68a0833374e6cb':
  Import translations. DO NOT MERGE