tree 0ac0f84688a2faadb1226149dcbe572c4a9ab6a4
parent 869060e13276f982486992d7ed236c8c06cf3544
parent e63659a8e83e5cf699a9f9eae4ff49ea848035e7
author Bill Yi <byi@google.com> 1524892470 -0700
committer android-build-merger <android-build-merger@google.com> 1524892470 -0700

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

Change-Id: I551e93d3560298a9ae205dfe168b77f8f94f72f3