tree 4065dbc84431d0caad138554d763536adb29a7ca
parent f6ec8d4d52f3766fd127ede6d1bc9ae3d53d505e
parent 61e43780acc1b9863aa68d4695ed363e1a1bb3af
author Bill Yi <byi@google.com> 1479691654 +0000
committer android-build-merger <android-build-merger@google.com> 1479691654 +0000

Import translations. DO NOT MERGE am: efa2852fb9  -s ours
am: 61e43780ac  -s ours

Change-Id: I0738565a88a1aa4d61790a1836ebac6379f85e8d