OSDN Git Service

am 5a531ff9: (-s ours) am ea9aec27: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sat, 12 Oct 2013 00:34:14 +0000 (17:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 12 Oct 2013 00:34:14 +0000 (17:34 -0700)
commit92756b89c8be90ceb9804f3e77731e233c522a2c
treeb5a083881334fe689ef65ee0bea057101ce66875
parent93a1154fbf3b2eb30bc721df3b16f6c52151475e
parent5a531ff96081c20cab087306907c406076a10ddb
am 5a531ff9: (-s ours) am ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5a531ff96081c20cab087306907c406076a10ddb':
  Import translations. DO NOT MERGE