tree c894337cf0494b68fc78f7172aececc498eb640f
parent fa95a97ddf9ba42aa7f3d996e858b4d1e2496604
parent 60102ca02f1a93af59cc479f2a80a40a382d668c
author Bill Yi <byi@google.com> 1491122135 +0000
committer android-build-merger <android-build-merger@google.com> 1491122135 +0000

Import translations. DO NOT MERGE
am: 60102ca02f  -s ours

Change-Id: Ib94ca3bec621651c8917857d392b23035addbfb0