tree c91289e5c1eac88aada08b2cd9868128b99308ef
parent c6fc75d21879c8e7d289a44b88d3be46924d30dd
parent 795498bf2f0204d89c2e5a3a0cb33159154a3e9f
author Bill Yi <byi@google.com> 1525673408 -0700
committer android-build-merger <android-build-merger@google.com> 1525673408 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 5b4a2da1ea  -s ours
am: 795498bf2f  -s ours

Change-Id: I0256f139d68dd905ca0383d570c01c3357445c1a