tree ce7d2cb513c4baf42b4510924e63ce9ea29fe09a
parent e2a7c24f038083e943f71570a756d6d253e3e778
parent a8276b8de4218dbfaa9f08f93be7ab8c60bf3ce0
author Bill Yi <byi@google.com> 1530854296 -0700
committer android-build-merger <android-build-merger@google.com> 1530854296 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f  -s ours
am: a8276b8de4  -s ours

Change-Id: I13817952fd66ca2501a35a0e1223bc7d932a2ddc