tree 2b7790731e50445ce310487d8fdb3870c1a3b625
parent 81ae7917c967b0592e5a508d7e92d4c54aa67c61
parent 3c4c009e883a5a8c72c94320ad47dec55d4d7d7b
author Geoff Mendal <mendal@google.com> 1454430665 +0000
committer android-build-merger <android-build-merger@google.com> 1454430665 +0000

Import translations. DO NOT MERGE am: ca1d1d0bbe  -s ours am: be79130a6b  -s ours
am: 3c4c009e88  -s ours

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