am 8f21bd29: (-s ours) am 35a5f7af: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 7 Jul 2014 17:40:26 +0000 (17:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Jul 2014 17:40:26 +0000 (17:40 +0000)
commit08b2636c031a070c4dd4207eed162bff332d785d
tree287b04a666abe84dc9f302d5771d3bd9b60660cf
parentfd74e7a7471474d1d5fcbfd8941c31ecfc47aee9
parent8f21bd292ee81f532469d931f3590af2d633a0b3
am 8f21bd29: (-s ours) am 35a5f7af: (-s ours) Import translations. DO NOT MERGE

* commit '8f21bd292ee81f532469d931f3590af2d633a0b3':
  Import translations. DO NOT MERGE