tree 8745c9b3956d8540c911f68c96ccfa13c76451ad
parent c63bd5bf42cb48caa659417863182f625b384959
parent 3c25b92d64412b1ed1bdadaa880d75febc4ad2b8
author Baligh Uddin <baligh@google.com> 1410901601 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410901601 +0000

am 3c25b92d: (-s ours) am a9612899: (-s ours) am 7f2bb52e: (-s ours) am ced0c8ed: (-s ours) Import translations. DO NOT MERGE

* commit '3c25b92d64412b1ed1bdadaa880d75febc4ad2b8':
  Import translations. DO NOT MERGE