tree f6da33736e419cb6e32d1af66c52c3e3fd868930
parent 1959d2182c188fea7c426620ca084764115be083
parent 5770cc3c2118cd07bbcd3894c687ed52c83a9e0c
author Bill Yi <byi@google.com> 1479693386 +0000
committer android-build-merger <android-build-merger@google.com> 1479693386 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 5770cc3c21  -s ours

Change-Id: I5e2f29d7d74c25618a82a251a57b75f04be26140