tree d9534d9f946bdb34d494eb1c6a5fa63a2314f0fc
parent d2caee61ded31cd6bb1d807c805eeecae49789cf
parent 742282346a265eebdc0258254050ae42baa24fb2
author Bill Yi <byi@google.com> 1527206211 -0700
committer android-build-merger <android-build-merger@google.com> 1527206211 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 742282346a  -s ours

Change-Id: Ic217b48d7893869967fb5f6deb3aa13602b72aff