tree 472554dfea564db92c83e8f43efe525a14e423a5
parent 9250a56f3a57a6d3afaad8fa535d5ba7b1f1605c
parent 28aeb5185fad158e0544c06bce8d7d69934da449
author Bill Yi <byi@google.com> 1508135612 +0000
committer android-build-merger <android-build-merger@google.com> 1508135612 +0000

Merge "Import translations. DO NOT MERGE am: b081f1e809  -s ours am: 43b03fbacf  -s ours am: 7e3f20e249  -s ours am: b597ff837c  -s ours am: 9336d62dcf  -s ours" into oc-mr1-dev-plus-aosp
am: 28aeb5185f  -s ours

Change-Id: I35663e31a17361df371c34f04665085d6d20ac27