tree c9ffa859d46f723e7d81f50ebbb3368bdd7a1fc4
parent 4448f63145e371d64292f1503ecfab5e05603a80
parent 2c697884a3ffb5fe7a2d4250301860cc57555737
author Bill Yi <byi@google.com> 1491123983 +0000
committer android-build-merger <android-build-merger@google.com> 1491123983 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 2c697884a3  -s ours

Change-Id: I2e43884e9fda71b912361b12c5d26873ccd92953