tree f3163c66879c97734776a985d00192cc57bccb00
parent fcc7eae6f06fde664771eae56baff034b42c212c
parent 7d1a7ea2ef901356c36f2949623cf0297a1e2d8b
author Bill Yi <byi@google.com> 1539486424 -0700
committer android-build-merger <android-build-merger@google.com> 1539486424 -0700

[automerger skipped] Import translations. DO NOT MERGE am: a5f77b6860  -s ours
am: 7d1a7ea2ef  -s ours

Change-Id: I20a700bb62a9792923ead613b86ee7e5461d55d5