tree 4930f3780725a5e51b83ff16fb1f8a4ed37a6ddc
parent aaa7c08cfa785f7723ea2c4851faa7fab391d96b
parent 2c709ccef909f3e0d37501e102a4a31b09be3837
author Bill Yi <byi@google.com> 1466139232 +0000
committer android-build-merger <android-build-merger@google.com> 1466139232 +0000

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

Change-Id: I36aaa841cc349605f0c2403f650ce2bcfa8f7e53