tree 5b6b2eb63f32d2e5dbe4be48410db7a17964daac
parent dab9eff8997deb81f8188826ba6049b3f7bb8425
parent 899f5cf30984a3b185fd85a14793039fe3055853
author Bill Yi <byi@google.com> 1506966705 +0000
committer android-build-merger <android-build-merger@google.com> 1506966705 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee  -s ours
am: 899f5cf309  -s ours

Change-Id: I79586b1902cfed6baa9db8d615e94b4fadab4740