tree 54e5a5e4e5f084722569a1cbdb1bbf032e725e90
parent 1affd531d2f15efb385f999acecee1d46780e176
parent dc0952fecb883d836482f9ed6ac9894087bb0c06
author Bill Yi <byi@google.com> 1558765677 -0700
committer android-build-merger <android-build-merger@google.com> 1558765677 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7cf55f2a69 -s ours am: 8a8ead03b9 -s ours
am: dc0952fecb -s ours
am skip reason: subject contains skip directive

Change-Id: I8167ff07cf2743b412f7eeb0b7d40fccb8b9cd32