tree 7b16fd125020780436501a9687fae0c7df613f7b
parent d57985ed32197da3e34a55d0c54dcc048a79d055
parent 902770c4691f44e746b698f7ac6cc0cfdc7aa078
author Bill Yi <byi@google.com> 1473251426 +0000
committer android-build-merger <android-build-merger@google.com> 1473251426 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57e29b4b9e  -s ours
am: 902770c469  -s ours

Change-Id: Ie8aa40878420d1675a91da84f46cfd623044fb0b