tree c560330f63f0d44302791c6c42268f18c5732def
parent 1586562095fed327edb35a4e0dcf1b7148ab982b
parent 06c02894824d79988b259f25b8813cc711d4a064
author Geoff Mendal <mendal@google.com> 1454430013 +0000
committer android-build-merger <android-build-merger@google.com> 1454430013 +0000

Import translations. DO NOT MERGE
am: 06c0289482  -s ours

* commit '06c02894824d79988b259f25b8813cc711d4a064':
  Import translations. DO NOT MERGE