tree 6a43c27bf5372f43e8946cc495942e4b6f4b5594
parent ecef26c8aa83fe4090cae8d5c54513c781c16359
parent 17efcd31043afee7437782cdbb5c13642c1a7f49
author Bill Yi <byi@google.com> 1491106698 +0000
committer android-build-merger <android-build-merger@google.com> 1491106698 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0ec174802b  -s ours am: a6b312c336  -s ours
am: 17efcd3104  -s ours

Change-Id: If7a37448a1b92b1d8549ebf71e97884c60904472