tree a70235945948deff0968ff1af50a810795685572
parent 9e2873bdf19cf5a05307c48e28f8fdb305dfcfeb
parent b2437b158ffd9a6f3d25116bdcb40cf8c6211578
author Bill Yi <byi@google.com> 1533394140 -0700
committer android-build-merger <android-build-merger@google.com> 1533394140 -0700

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

Change-Id: I9e822becc54b156209f3ca16255e0a90dd0eb51c