tree 3a2b10641713471361533f713126f63309c6087e
parent 5c9582b4174b1d5452d1a11d82c27f65db931f68
parent 5b67a302d4e841a2065eb89f99d319cad2fcde7b
author Bill Yi <byi@google.com> 1520083091 +0000
committer android-build-merger <android-build-merger@google.com> 1520083091 +0000

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 5b67a302d4  -s ours

Change-Id: Ieab93fb1ab78ad5633e328eee9c59616239ea487