tree f34842d78811e4f752617518272272f15e235f9c
parent b15d15b3031279dd119c9d9ed5f560218cee4827
parent 3aae4ec242994ae591860e73e10135abab6e72ed
author Geoff Mendal <mendal@google.com> 1458570678 +0000
committer android-build-merger <android-build-merger@google.com> 1458570678 +0000

Import translations. DO NOT MERGE am: 78302c3  -s ours am: 4c3bb2a  -s ours am: 11081a1  -s ours am: 8d59076  -s ours
am: 3aae4ec  -s ours

* commit '3aae4ec242994ae591860e73e10135abab6e72ed':
  Import translations. DO NOT MERGE