tree a7082c81d26c04072eee268b5aabbf49d964de13
parent 9514ba78d31e794d3cdfbfc5fff47b5cb4f9c262
parent d2324631934e9d53f03502159b01cf3f19c1024a
author Bill Yi <byi@google.com> 1492098656 +0000
committer android-build-merger <android-build-merger@google.com> 1492098656 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev am: 9e8fa5ec61  -s ours
am: d232463193  -s ours

Change-Id: Ibda3fa55ced29f7ad8001cc4a1bc1c077eca3351