tree 5aca6e89d5503e71158637b0ee1394515ca83084
parent da85ed87923749154e6f5caef85fb6723c1c53e3
parent fc8af23e97cc29d4af5f3d4df05ffb339e34b08e
author Bill Yi <byi@google.com> 1550347925 -0800
committer android-build-merger <android-build-merger@google.com> 1550347925 -0800

[automerger skipped] Import translations. DO NOT MERGE
am: fc8af23e97 -s ours
am skip reason: subject contains skip directive

Change-Id: I4ff4a94f634207aa24c72788a755565798782cba