tree fa770ebc1c4e0b48852c19501b4e84c9aeffda3e
parent cb131edf70bcf92b859995b003f4f9809836cdb1
parent f5fd826cbba6d69293b17e0bcda37c11ddb359c3
author Bill Yi <byi@google.com> 1475313460 +0000
committer android-build-merger <android-build-merger@google.com> 1475313460 +0000

Import translations. DO NOT MERGE
am: f5fd826cbb  -s ours

Change-Id: I51e723a1d035fd48cf9a85980c88a13da1b7a7ef