tree 8c3db70c6823534b4e3c15948b030a17a5bc04a2
parent d6cc05be1de8610ec59da2dd3d459437601fc5af
parent 5223e55714f9a1e605c51ba577907314655dc436
author Bill Yi <byi@google.com> 1528132426 -0700
committer android-build-merger <android-build-merger@google.com> 1528132426 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 5223e55714  -s ours

Change-Id: Idad46c75f15d0c86502a6da620729217798fbe66