tree fc8354838b8943e2bfd623731752402f4ea3d649
parent 01c8f097ccd975f85329fdf16883ef260df91868
parent b6cc8181a6ce8da3dc6839c40456776e995e82fd
author Bill Yi <byi@google.com> 1526799184 -0700
committer android-build-merger <android-build-merger@google.com> 1526799184 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 53becd2ef0 skipped: cee1a4b220 am: d23abaa02e  -s ours
am: b6cc8181a6  -s ours

Change-Id: I6031527ec474567585d89f67a8e7fad64e80fc62