tree c979f6147a99362f63ed092199ee2c06cd56556a
parent 563b613d8d765d3e34caa7a9f9650e277a85a93d
parent 2c1f37446392e9e8c092b85fba0f2a6af3b6079c
author Bill Yi <byi@google.com> 1512082859 +0000
committer android-build-merger <android-build-merger@google.com> 1512082859 +0000

Import translations. DO NOT MERGE
am: 2c1f374463  -s ours

Change-Id: Ic9f01a269d70aba1c5da3b76ed2929f6729ae28b