tree b8b6458f71902ec8abef43b8370497a631aa5a2f
parent 0594674ecb6cc9811f2c56a41fbb39c404296083
parent 4ad0db127e14ccf1f2f0faeea967e74d60cb38c5
author Bill Yi <byi@google.com> 1508517709 +0000
committer android-build-merger <android-build-merger@google.com> 1508517709 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b  -s ours
am: 4ad0db127e  -s ours

Change-Id: I22bb3057e7e08bd94e05e028d22746be53698541