tree 2f0066b895ef36fe536cb0bc5282821e8b736e7f
parent afc72a639bc8ec3c238c4ff01adc1199348aeca9
parent 5c0301ef9545a09310b9a16b76f6b20d2bb0029f
author Bill Yi <byi@google.com> 1502084789 +0000
committer android-build-merger <android-build-merger@google.com> 1502084789 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c733eac940  -s ours
am: 5c0301ef95  -s ours

Change-Id: Iab0a9abe763d89367d4dc8dbe96b4ab461f8af98