tree 682a7846840ed27e236c3ae72b732f9703eaa185
parent b2883febe924cc4cdb2023c78f86714eca4861d6
parent 3b790720405554372e1385536da30feea3df30ad
author Bill Yi <byi@google.com> 1500545415 +0000
committer android-build-merger <android-build-merger@google.com> 1500545415 +0000

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

Change-Id: I2355fc5b35b5fd65c04676336e77a7714e4c7925