tree ce7d2cb513c4baf42b4510924e63ce9ea29fe09a
parent f9a749eb82c5d8c811464de8dc14971261f4ca47
parent bf6bbefe57f6c7362d41a4623e2b8b1599f38e75
author Bill Yi <byi@google.com> 1530855027 -0700
committer android-build-merger <android-build-merger@google.com> 1530855027 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144  -s ours
am: bf6bbefe57  -s ours

Change-Id: Ife52c79c0b85d9f09f1d2cf7b792239aaae24868