OSDN Git Service

am 0dea3a6e: (-s ours) Merge "Import translations. DO NOT MERGE"
authorBaligh Uddin <baligh@google.com>
Thu, 24 Apr 2014 14:34:10 +0000 (14:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Apr 2014 14:34:10 +0000 (14:34 +0000)
commit3c141d538018fcec317fab789a4ac89850d61888
treead213e79c57605c23a410783dfe74cc41344e408
parent48eff83a5b7ee19bd9215df07f3bfc3583073533
parent0dea3a6eeac31fff541c284bbf74f123ac163cd2
am 0dea3a6e: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '0dea3a6eeac31fff541c284bbf74f123ac163cd2':
  Import translations. DO NOT MERGE