tree aa49f06a9cb55feb83dd5a11ef3b525f8e385ac1
parent ebe7e23af7958bb79964244370a5bb39134fc7de
parent ac7dd9a101791e46faadb60f99a2fb58884a9baf
author Bill Yi <byi@google.com> 1475746820 +0000
committer android-build-merger <android-build-merger@google.com> 1475746820 +0000

Import translations. DO NOT MERGE
am: ac7dd9a101  -s ours

Change-Id: Ibb296699e4f333586b7637ee7feb31da127e3c96