tree d4d3ed91feae7aca6a2750875c5a7ce55969feca
parent 451b4c5b3c3531b7b84ea8bf74fb099da76099df
parent a93d93a2d385b93729b0c434bc3096a30a28c274
author Bill Yi <byi@google.com> 1499441933 +0000
committer android-build-merger <android-build-merger@google.com> 1499441933 +0000

Import translations. DO NOT MERGE am: 69d5291070  -s ours
am: a93d93a2d3  -s ours

Change-Id: I2a96f26b713beb0fb3db0e1fb94b63129a6dee5c