tree 6367992681dfe95b532d32eae2285f77cf5df29f
parent bb8467f156bd9e87c999ba90a6901bbd9e741445
parent f9d7884ef66d43ccd3f85959cfa4689e81bb6b3a
author Bill Yi <byi@google.com> 1508218698 +0000
committer android-build-merger <android-build-merger@google.com> 1508218698 +0000

Import translations. DO NOT MERGE am: 7b3201854c  -s ours
am: f9d7884ef6  -s ours

Change-Id: I38b2b69548eed1a599d3819a8a3dbd82c9770c71