tree 5e81f3b89eff85973b711bf1151068ce058bdb97
parent 06299c5934ac32b7910edb387fa4a5cab7099732
parent 8fa64a88084c2b8624b9fbbb79dbbd33bc0f1e50
author Bill Yi <byi@google.com> 1508211050 +0000
committer android-build-merger <android-build-merger@google.com> 1508211050 +0000

Import translations. DO NOT MERGE am: 495713d814  -s ours
am: 8fa64a8808  -s ours

Change-Id: I98b1234b0302f979c96b4e4ab1adb243b21b24f1