tree c922eb5bc5f8b492e02673671bdd732111a584e8
parent 8d4cc3d97aa4ada306b1e619e2940e810626eee5
parent cf69168837f0fe92d0d8ae0badae6816373c1f96
author Bill Yi <byi@google.com> 1524891927 -0700
committer android-build-merger <android-build-merger@google.com> 1524891927 -0700

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

Change-Id: I3c9b7b2c63ca33b8044893753e713eef55ad4fcc