tree cba62d0d64153aa2169651696bc238591341d679
parent 7b31b34898cebc5587ba34a619af8bff2921cc27
parent 171ed627eab58b017bed79d267ad3def7ab90b7e
author Baligh Uddin <baligh@google.com> 1414085123 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085123 +0000

am 171ed627: (-s ours) am 6670a579: (-s ours) am a8484d84: (-s ours) Import translations. DO NOT MERGE

* commit '171ed627eab58b017bed79d267ad3def7ab90b7e':
  Import translations. DO NOT MERGE