tree cba62d0d64153aa2169651696bc238591341d679
parent 7817eb56dcf509d443d991943f9ad9b46b66dcb8
parent 30146cb92d6e792dfa5639bc6aff6494c4a425ae
author Baligh Uddin <baligh@google.com> 1414085340 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085340 +0000

am 30146cb9: (-s ours) am 4e7091d3: (-s ours) am 73b1d566: (-s ours) Import translations. DO NOT MERGE

* commit '30146cb92d6e792dfa5639bc6aff6494c4a425ae':