tree 929fb8607883687a9e0223c0d38db0266ad27bcc
parent 22d0d0871aee9999dc2895feb02720f36d8e0c72
parent eb304c9e77eacedc3fb619c0ab56c8d7f6424aab
author Bill Yi <byi@google.com> 1550475746 -0800
committer android-build-merger <android-build-merger@google.com> 1550475746 -0800

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

Change-Id: I2b941d42c662dc55b203742616f6cd19d46b4977