OSDN Git Service

am 7f4c7641: (-s ours) am c6adece0: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 6 May 2013 23:20:44 +0000 (16:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 May 2013 23:20:44 +0000 (16:20 -0700)
commitb72ffa24790747e1ecdf89d0fde3c63cb677800d
treedb04d9bdd37b8a9b9539bef2e02daa27ed6f1b95
parent68a958619d2eda299e15aac6ec5f8f9c4a7abdb4
parent7f4c7641e0ce85162eb8f5c8846e35db29a068f7
am 7f4c7641: (-s ours) am c6adece0: Import translations. DO NOT MERGE

* commit '7f4c7641e0ce85162eb8f5c8846e35db29a068f7':
  Import translations. DO NOT MERGE