tree c348e640d56e590d668c6c56b48477cfb12258a8
parent d0a4f2e8e509394955e731985055ee00e8d94472
parent 7435f644062074a96f4b22e8997d765c1903fa46
author Bill Yi <byi@google.com> 1533393055 -0700
committer android-build-merger <android-build-merger@google.com> 1533393055 -0700

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

Change-Id: Ia6e2f66e0647c76deddc16dda7446a2829fb965a