tree 59d236a3d66d9ff2efe43dc7fcc19c0b86cc6fa6
parent 0e36f35161aae2bcf1cc9a5719b2363c7acd074e
parent 82032c439c10fa69073cb6565fda84eee75d7662
author Bill Yi <byi@google.com> 1522904660 -0700
committer android-build-merger <android-build-merger@google.com> 1522904660 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 82032c439c  -s ours

Change-Id: I9ad58b88d045eeea97154b20b6784660f8b86120