tree 79c77333cea92dd14b10853fae3e99f2db08f98b
parent 42ab23339b72a7f897c80d75955fc8f656364da6
parent b63c6619279cd1897c1384c59c3f471ed723e176
author Bill Yi <byi@google.com> 1532111655 -0700
committer android-build-merger <android-build-merger@google.com> 1532111655 -0700

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

Change-Id: I2eeb87bd30a8d440603d78b6b6583e7aa2129410