tree 0ac0f84688a2faadb1226149dcbe572c4a9ab6a4
parent 27c67ecff8045a3dda8172cb7eaa453f5e35616a
parent 5b4a2da1ea1ce6662c9b72f18f70ed4675feb08a
author Bill Yi <byi@google.com> 1525672876 -0700
committer android-build-merger <android-build-merger@google.com> 1525672876 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 5b4a2da1ea  -s ours

Change-Id: Id00b6d832acefcb87bb52178c8d959f9b8e133b5