tree 3b24ddf748c98592b3faa3856a34501afa8c046f
parent 17c5d327e10a5b0b16e56e2ec987d7e959173447
parent 0669310b2be6e5067712ee7806a3b942e9a196a3
author Bill Yi <byi@google.com> 1539599379 -0700
committer android-build-merger <android-build-merger@google.com> 1539599379 -0700

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

Change-Id: I0c05cf9b96fc7d797c5145d2c894d69e098fb2e0