tree 8ac071c07ff9b01f8abdd609be0c989e791e5088
parent 0240dc99db0a1a5d16ce7911a1e2c473421516b5
parent db61e7ec7305696744bdbc6d4a8b6d44c5952ca4
author Bill Yi <byi@google.com> 1504041269 +0000
committer android-build-merger <android-build-merger@google.com> 1504041269 +0000

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

Change-Id: I1ef8dabac664c06ead9dffa6a515cd9fd50e2175