tree 370072986bf76f0d9cb75c973b87f251d8fe2644
parent 72ebbaa60875b0f95bab23ac2cd2f964f20b89bd
parent 365656b09772f78cc990086e3eebd904f18a4abd
author Bill Yi <byi@google.com> 1526187813 -0700
committer android-build-merger <android-build-merger@google.com> 1526187813 -0700

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

Change-Id: I6e9717ecc398c2503fddefc0ce4bcbc357151425