tree 6f185d79a7139a83e269b8946ef784932d39be8f
parent 18c7389c278ab8bcf8a886b37e88b96a6e90fa14
parent a8c2b1a43150e67c606319d3e8f18ed7e854f989
author Bill Yi <byi@google.com> 1502876062 +0000
committer android-build-merger <android-build-merger@google.com> 1502876062 +0000

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

Change-Id: I93831c414c6069144d04d36495cee14e51303726