tree 688c2bbf0ca2381b5f5dee26e1cebe1c13047a39
parent ab620613b91bc104a1be52715e1106c673b0cbc2
parent ed8860238c09c1d36993a38d99e22f6a18e9d026
author Bill Yi <byi@google.com> 1498594211 +0000
committer android-build-merger <android-build-merger@google.com> 1498594211 +0000

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

Change-Id: Ic97752e1d08ed4f9e8a9b914608f170f48cdc292