OSDN Git Service

am f9121463: am b0aae659: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sat, 10 Nov 2012 06:41:42 +0000 (22:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 10 Nov 2012 06:41:42 +0000 (22:41 -0800)
commit015b736a58fd62d8a8a07f1a228aab29c5d42300
tree8d84df712c39dca5169096aa596cbec6fa0f40ab
parente18f667cf96db59f30c50422fea6ea5e19d64055
parentf9121463776a173c492bf699a130492648df63a2
am f9121463: am b0aae659: (-s ours) Import translations. DO NOT MERGE

* commit 'f9121463776a173c492bf699a130492648df63a2':
  Import translations. DO NOT MERGE