tree 746132bdd8ae169add10c9bbf98a680afe23208f
parent 6935d4ee3295834e3ba173a1b13077a6c86fbba5
parent c692ada956a866eb644481fc4382a20d53b04e21
author Geoff Mendal <mendal@google.com> 1454429051 +0000
committer android-build-merger <android-build-merger@google.com> 1454429051 +0000

Import translations. DO NOT MERGE
am: c692ada956  -s ours

* commit 'c692ada956a866eb644481fc4382a20d53b04e21':
  Import translations. DO NOT MERGE