tree 6abf25d12e72d7e298eca8db9479f61fe709d335
parent d65cbc44427f6926af3ca5910cecd2b1b2636403
parent 60af01bec90cbc59463554c5fda3a4acad4bbb32
author Bill Yi <byi@google.com> 1505765801 +0000
committer android-build-merger <android-build-merger@google.com> 1505765801 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours
am: 60af01bec9  -s ours

Change-Id: I920bb3060556824d8185701b10ea71828e242591