tree 64819aad644886e5126c7df0ab889afc2f6f3e68
parent 29dc99f9e89e49c6e7e9ecc2cdd935ab719d6cb5
parent d11f95ad46840eeaf8bd5bfbb56494ea6376acdf
author Bill Yi <byi@google.com> 1512007581 +0000
committer android-build-merger <android-build-merger@google.com> 1512007581 +0000

Import translations. DO NOT MERGE am: c1bca0543a  -s ours
am: d11f95ad46  -s ours

Change-Id: I5694269c6761dfb06400d5164e587cf5677b3d2c