OSDN Git Service

am ab96bf7d: (-s ours) am 1613cafe: (-s ours) am 70062156: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 8 Oct 2013 04:03:29 +0000 (21:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Oct 2013 04:03:29 +0000 (21:03 -0700)
commit6558332576d3db959a513146863c815085c98d8f
tree48ed49f6337318344ba5e7c1bbb96ed4bb469f6d
parentc1dbbcd331a7bc2b97de49104480ea10f19557fc
parentab96bf7dd884b4885faf3e995fccd8d45c659878
am ab96bf7d: (-s ours) am 1613cafe: (-s ours) am 70062156: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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