tree b6a94ec304ea77c9a170ece46d9d5687d0fc7152
parent c844ea5c96bebd5ea3aa4cf13eb9ce68782b7513
parent f028e75015c198200c0e16f9e1abbca299cd43ba
author TreeHugger Robot <treehugger-gerrit@google.com> 1526599390 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1526599390 +0000

Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2
  [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927
  Import translations. DO NOT MERGE