tree f6da33736e419cb6e32d1af66c52c3e3fd868930
parent f4561d90dc4b7d16e0aa3f910a76f8cecb6b955f
parent f94b944f806da8d87f158a03ff67c010a9e8d1b2
author Bill Yi <byi@google.com> 1479693108 +0000
committer android-build-merger <android-build-merger@google.com> 1479693108 +0000

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

Change-Id: I80015e96b7658dc3d2a94f33637422b413c285e2