am 4e4ef211: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
authorBaligh Uddin <baligh@google.com>
Thu, 17 Oct 2013 15:33:36 +0000 (08:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 15:33:36 +0000 (08:33 -0700)
commitc0498333d7a836f24ea72934e9d8d118a273b324
treea3aaf2d222ef5feebfcca9a81c7548a8964ec8da
parentbd8d9a406049d74bc6b5de94b6cd76e5bcd35ad8
parent4e4ef211382d05c17c93b68fe0ab347a64951a9c
am 4e4ef211: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '4e4ef211382d05c17c93b68fe0ab347a64951a9c':
  Import translations. DO NOT MERGE