tree 8324dcf24d0f1777749a053996159eaf8b5b8c1d
parent 1a150d30164431b22acdc25f607998313ac9ef05
parent 8e3ef3d0a6849ce65abf0eaa1bd59615a12aaca9
author Bill Yi <byi@google.com> 1501938945 +0000
committer android-build-merger <android-build-merger@google.com> 1501938945 +0000

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 8e3ef3d0a6  -s ours

Change-Id: I712d2de1b81630ca2c24e1bf4cecd527d19b4af7