tree 7e775dd544f0beaa76474c3af1712e6e1f371bee
parent 8d9df4b04271811196bd038c5cd0d337595b859c
parent 923f65751a5ad95e383f8efbc85738a7e05b3d62
author Bill Yi <byi@google.com> 1523910295 -0700
committer android-build-merger <android-build-merger@google.com> 1523910295 -0700

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425 am: cb80417eab  -s ours am: 3194fdd40a  -s ours
am: 923f65751a  -s ours

Change-Id: I8b64a8fbbbcd92a6a949bcae98b44f37c0a4e09c