tree 1fdea631d5d584f1658a7b3eb17199824f76c9ea
parent f051b28554a1628ebffc900192ffb9f04306b21c
parent 998f40e6c57dd738ade1980c6c06a6f72879978a
author Bill Yi <byi@google.com> 1530848532 -0700
committer android-build-merger <android-build-merger@google.com> 1530848532 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
am: 998f40e6c5  -s ours

Change-Id: Ifdbc60e6748887feedc47eb60843d231dae46146