tree 845eb03a40493d9be0c28c66c24a4cfc5a746da4
parent cafb87ea51d9683c46c58833e1a6433a2c184bbb
parent 7ca233a412c6d4120a99836ba42dece44ddc8a28
author Bill Yi <byi@google.com> 1508514978 +0000
committer android-build-merger <android-build-merger@google.com> 1508514978 +0000

Import translations. DO NOT MERGE am: 18565f68c4  -s ours
am: 7ca233a412  -s ours

Change-Id: I2955c79b0bd8fea0d8dcc877edea4a8711082ec4