tree 2406fe8280cf92fb931fa11c7e69e351249326c5
parent e083c8ea8859bf6f0c59486411d087f49cd4adfa
parent 1959d2182c188fea7c426620ca084764115be083
author Bill Yi <byi@google.com> 1479694510 +0000
committer android-build-merger <android-build-merger@google.com> 1479694510 +0000

Import translations. DO NOT MERGE am: de5a72d802  -s ours
am: 1959d2182c  -s ours

Change-Id: Ic59f23548fff2936730508652c2175859871cb43