tree 23d2558804bca7a3d79eedf192f2fabe55b9b16f
parent 5f16d61150d4b994241f6cb65d92124cbada3f9b
parent d01f664caefcf643d936ac8ffa8a82ef2a00b53c
author Tianjie Xu <xunchang@google.com> 1542766169 -0800
committer android-build-merger <android-build-merger@google.com> 1542766169 -0800

[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: d01f664cae  -s ours

Change-Id: Ia12ae9d3a41efabfeb34adae7bddc21296bbcd0b