tree 8853a0beca525de811333d2127efd369bb3e0e09
parent 7cbd8a55ee1e89583bdeaf019c2cc3602ec55534
parent 66838ce1e80d53fc67e6a2a215cc7d13e28ca060
author Baligh Uddin <baligh@google.com> 1412023828 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023828 +0000

am 66838ce1: (-s ours) am cc665090: (-s ours) Import translations. DO NOT MERGE

* commit '66838ce1e80d53fc67e6a2a215cc7d13e28ca060':
  Import translations. DO NOT MERGE