tree b814fd3997245dec735c2fda4dcca24793350b37
parent 8423699c11d5fb95c2b1eb2308ba0bcebe675f4e
parent c38d4954d0676b9e2dd2e373273bddc2ef3e3502
author Geoff Mendal <mendal@google.com> 1458355518 +0000
committer android-build-merger <android-build-merger@google.com> 1458355518 +0000

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

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