tree 6d94f7072a097a8ed700480ede4be7fa8608e5a4
parent d6225b1e568139b2890e701f9fdbc10a5421ee90
parent fb99124961b105958761e41861c578817505b7d1
author Bill Yi <byi@google.com> 1533396743 -0700
committer android-build-merger <android-build-merger@google.com> 1533396743 -0700

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

Change-Id: I77965dd503751f31ae49dd01901be2b2be88fe08