tree 788ae906aed9e8dfc5666eb7e05203bce2006e77
parent 6fc737cc775bf80dbde9458dedfd83891c6367f3
parent 4708550ab413d0120cfe0d93daf6f200e49be625
author Geoff Mendal <mendal@google.com> 1427160786 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427160786 +0000

am 4708550a: (-s ours) am 674d1d6b: (-s ours) am 47d342c3: (-s ours) Import translations. DO NOT MERGE

* commit '4708550ab413d0120cfe0d93daf6f200e49be625':
  Import translations. DO NOT MERGE