tree 242b68fc36f69c7826a7f30b4df3755f96decc2b
parent 9b1acb1bfca049eb6b4ef54776be3c6bb000f65d
parent 47c74c47a0fd85235576dc66d1da05f70e78aeed
author Bill Yi <byi@google.com> 1486110326 +0000
committer android-build-merger <android-build-merger@google.com> 1486110326 +0000

Import translations. DO NOT MERGE
am: 47c74c47a0  -s ours

Change-Id: I9ec14e77aaf3be51a8d2b5e87b33355398fba238