am 1dbf8e6d: (-s ours) am da4761b8: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sat, 16 Aug 2014 23:03:37 +0000 (23:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 16 Aug 2014 23:03:37 +0000 (23:03 +0000)
commit57b4a3063883dda338325bbb948aa07de97a3772
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parentf3568b893f65e6dd041c7d0e3ca80937b79e4b08
parent1dbf8e6dd598e68015ebabbb6a206e4e386d002b
am 1dbf8e6d: (-s ours) am da4761b8: (-s ours) Import translations. DO NOT MERGE

* commit '1dbf8e6dd598e68015ebabbb6a206e4e386d002b':
  Import translations. DO NOT MERGE