tree bff25596cdc8cbd4f10c746d382a98fd49d12159
parent 8082dc7ce27ebf27080fc0944deccea09e09c44d
parent b30e7a282b13af9dd9160936b01b5f21e0579f9c
author Bill Yi <byi@google.com> 1539600874 -0700
committer android-build-merger <android-build-merger@google.com> 1539600874 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ed5f4fc037  -s ours
am: b30e7a282b  -s ours

Change-Id: I39cf43c07d052983837e6c32a132bae86673dbbe