tree 1c5a53836b6aaa3505f627ac5ef327c996614306
parent a9389bf5933cc496871d4fd30915d7bb13b72646
parent 61385acb7a550beb071270cfb6efe1724194a0b3
author Bill Yi <byi@google.com> 1484801302 +0000
committer android-build-merger <android-build-merger@google.com> 1484801302 +0000

Import translations. DO NOT MERGE
am: 61385acb7a  -s ours

Change-Id: I010af0e35746aaa80b902ed0342d3aa8d66c6a2d