tree 8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parent a68b3e37d758f0c305e0848f89a2ace8c691d3a9
parent 86ce04b6e0242b16c5c7b756a0bcfb0539e79667
author Bill Yi <byi@google.com> 1470421952 +0000
committer android-build-merger <android-build-merger@google.com> 1470421952 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours
am: 86ce04b6e0  -s ours

Change-Id: I5fc1263b33bd46044de5d9c3576d190983b5e20a