tree 857236cf38a54ac277447ad482d4e3b486cea312
parent af30b1793040ef4cddb8bcdda9fa27ba412dff08
parent 424d01398b00e26fbd04a2a738236f6f42883312
author Bill Yi <byi@google.com> 1532930824 -0700
committer android-build-merger <android-build-merger@google.com> 1532930824 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637 am: 70ebabc63d  -s ours am: 786ae0d322  -s ours am: 3b822cd077  -s ours
am: 424d01398b  -s ours

Change-Id: I954548c4f661bb80c33d921abe3bad5152ca034b