OSDN Git Service

am 65588053: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
authorGeoff Mendal <mendal@google.com>
Mon, 17 Nov 2014 20:20:31 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Nov 2014 20:20:31 +0000 (20:20 +0000)
commit961a5836314cfb18c20002dd46d7c31776d9ce03
treef439482e80559f310178bb050de770ca86fb0b23
parent11bdd5b10b5f921b657283fa94463263171218d5
parent65588053164fd51a69c5110c1e75c8712cd69e2c
am 65588053: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '65588053164fd51a69c5110c1e75c8712cd69e2c':
  Import translations. DO NOT MERGE