tree b404f1852236c4abf98f02a8f51da8ce4009985a
parent 87cb5434172fe487e22f1e0f597eb1f0576e37b8
parent 92048f760993e47e7fe74876fefc3d934dcf93fa
author Bill Yi <byi@google.com> 1522286370 +0000
committer android-build-merger <android-build-merger@google.com> 1522286370 +0000

[automerger skipped] Import translations. DO NOT MERGE skipped: 74af8e024f skipped: b763502d6b
am: 92048f7609  -s ours

Change-Id: Iacf08c21a51bcbf8bb479fe0734f3a33ea43779e