tree 64e8dc4db7b669988fac7d11b1101e600feb5fc2
parent da75763eedf5821e166c726d54802b2f36aba455
parent f974c9d038278953cf7adb862275dd65491be640
author Bill Yi <byi@google.com> 1474083174 +0000
committer android-build-merger <android-build-merger@google.com> 1474083174 +0000

Import translations. DO NOT MERGE am: 4de452f333  -s ours am: a8a5f8a749  -s ours
am: f974c9d038  -s ours

Change-Id: I026fc1b1d3c224af28ac63fbc0459e6acf24e928