tree 29ef3ddff4694603720ece73b4550427feb84351
parent 784fab0267494a7ccff424e5aa7ca04c6aa4aa11
parent 6817403ab1055ea848ff99e8bf2d05af061bf9fd
author Bill Yi <byi@google.com> 1538283897 -0700
committer android-build-merger <android-build-merger@google.com> 1538283897 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 6817403ab1  -s ours

Change-Id: I044d6e6118fa8e88602a4c84a227672405e8c6c2