tree faff7bf5408d9e495ac9a6ee4c0266939480c6bc
parent 72c99277ae6dd2a871a50189e1f45791108bb267
parent 2962df6990830b72f7139475d7238ecdb4dda851
author Baligh Uddin <baligh@google.com> 1443536917 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443536917 +0000

am 2962df69: (-s ours) am eb41844b: (-s ours) Import translations. DO NOT MERGE

* commit '2962df6990830b72f7139475d7238ecdb4dda851':
  Import translations. DO NOT MERGE