tree 07a11cdcf6d620125a7b6a89d663426823d5d377
parent 4e279cf5d7f859d63a840d58fd0a54b2874d80b9
parent 91487964b09779859fc9ff9802b9059f29903e85
author Bill Yi <byi@google.com> 1502898513 +0000
committer android-build-merger <android-build-merger@google.com> 1502898513 +0000

Import translations. DO NOT MERGE am: 20fa1a92cc  -s ours
am: 91487964b0  -s ours

Change-Id: Ic68759c25fba8d762db9b09e8cf2cb1a161dc43e