tree 65659ea5cfb72a29c9dd304bbc754078c2b689bc
parent 437e60bc761815e5fd2a4c9bd28745e822dbcff9
parent 97dd8c21efa751ebcaeaf4f10f40450bfa245f69
author Baligh Uddin <baligh@google.com> 1400164638 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400164638 +0000

am 97dd8c21: (-s ours) am 591f23a6: (-s ours) Import translations. DO NOT MERGE

* commit '97dd8c21efa751ebcaeaf4f10f40450bfa245f69':
  Import translations. DO NOT MERGE