tree b443ad9aa983029bf388f2e50ed20f3edb3a4969
parent fc4e38ec06730b73cb384ab92f197aa15ff886e8
parent 00950bf4016cafe475b71ef5720c079758687997
author Baligh Uddin <baligh@google.com> 1411413475 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411413475 +0000

am 00950bf4: (-s ours) am 1c820785: (-s ours) Import translations. DO NOT MERGE

* commit '00950bf4016cafe475b71ef5720c079758687997':
  Import translations. DO NOT MERGE