tree e34f9c3fdf38e2b3b921da176593a5f2e98332b2
parent 4e6e2792a63b79d62b8058c28d4ed85fb2ef63d8
parent 2dc7e093b4003294aacc9465922c32951ab02124
author Bill Yi <byi@google.com> 1502917340 +0000
committer android-build-merger <android-build-merger@google.com> 1502917340 +0000

Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev
am: 2dc7e093b4  -s ours

Change-Id: I0dfea4c7aafd2b62aa5f57a643c952ef89b2f2e9