tree 79e3d680804b9737a8720f9bff4597f7e95e9b18
parent e4a5394355d5cd0073602129c927fa013d546783
parent c73ee760f22db4a096b65ede3f6c23d94fa2860e
author Bill Yi <byi@google.com> 1479691666 +0000
committer android-build-merger <android-build-merger@google.com> 1479691666 +0000

Import translations. DO NOT MERGE am: 675a0f073a  -s ours
am: c73ee760f2  -s ours

Change-Id: I8092a84c8b3d30c74a2e0bd165d542233695a168