am 9b6bb995: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
authorBaligh Uddin <baligh@google.com>
Sun, 6 Oct 2013 00:11:16 +0000 (17:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Oct 2013 00:11:16 +0000 (17:11 -0700)
commit59b54d55772fbb4d6f28099f9128c14dd58f9dae
treedacf4b675ec8f111b3187535076a27498acd81a4
parent74a976d17222cbb2214ca2d86062d842293eb9fc
parent9b6bb99520cd6252443b5c800f7f9f73ed272f54
am 9b6bb995: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '9b6bb99520cd6252443b5c800f7f9f73ed272f54':
  Import translations. DO NOT MERGE