OSDN Git Service

am 1613cafe: (-s ours) am 70062156: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 8 Oct 2013 03:58:32 +0000 (20:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Oct 2013 03:58:32 +0000 (20:58 -0700)
commitab96bf7dd884b4885faf3e995fccd8d45c659878
treecfa574030f29ee7ebd5cfef004d96ee9130b4e11
parent4c9b9a321a9b7158d4078dea91a402d4047bfddf
parent1613cafe57bb92a8120e2f386f8fe442a5ec0d63
am 1613cafe: (-s ours) am 70062156: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1613cafe57bb92a8120e2f386f8fe442a5ec0d63':
  Import translations. DO NOT MERGE