tree c5e5718c514dd7e1b334fcdd2f10d58abc49580f
parent 5847d5270ceec133dd06ad189562ce7fe209f9d4
parent c2cc2dcf35d0741d3c2fce699b5388650331be63
author Bill Yi <byi@google.com> 1502038219 +0000
committer android-build-merger <android-build-merger@google.com> 1502038219 +0000

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 52a019ef56  -s ours
am: c2cc2dcf35  -s ours

Change-Id: Ice373b47dbccad212871c04d2407879017c7cad8