tree b0e716333b26b82220c50d9475120a5b978c23ec
parent c1bae1896b3e67085df6602cfff2488df46b8fac
parent cfb95b679afb044845544b10525cefb6125a8297
author Bill Yi <byi@google.com> 1505354180 +0000
committer android-build-merger <android-build-merger@google.com> 1505354180 +0000

Import translations. DO NOT MERGE am: 47a4e0a018  -s ours am: f01ca95913  -s ours am: e3c1214805  -s ours
am: cfb95b679a  -s ours

Change-Id: If03f064f36a4f90a2fea2634f056031e764c095a