tree c348e640d56e590d668c6c56b48477cfb12258a8
parent d0a4f2e8e509394955e731985055ee00e8d94472
parent 878c6a9d750d645241dedf79e0caba909ec70cf3
author Bill Yi <byi@google.com> 1533393547 -0700
committer android-build-merger <android-build-merger@google.com> 1533393547 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7435f64406  -s ours
am: 878c6a9d75  -s ours

Change-Id: I37a617e020e32b134fe76dd685cbb6b4c4a6950d