tree 7b9e0d06249601791237d88abcbef934dcd245ff
parent ef099b4fff198f421e2c890424a938414cbd817d
parent 5e6dbf35511529c17a3a3ca8ecad49079f6763eb
author Bill Yi <byi@google.com> 1525067540 -0700
committer android-build-merger <android-build-merger@google.com> 1525067540 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 5e6dbf3551  -s ours

Change-Id: I12d8527508a251122470949216f99ed980270c68