tree 2665c8d8acf7455978b53d990f455a615d6d4631
parent 757cd8a36cef7f621230769d1ddac49a843ab019
parent 5600cc562ce7f1160ed1e18a7dd15c467e66c36b
author Bill Yi <byi@google.com> 1569422623 -0700
committer android-build-merger <android-build-merger@google.com> 1569422623 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 0e06b18b30 -s ours
am: 5600cc562c -s ours
am skip reason: subject contains skip directive

Change-Id: I275b63571980ac66a15af2bf2e5e8cf8e88eaaf1