tree cce35e9b04e4971de4aa05635f9f69b39a8c4e41
parent 9282876d7c5693cccb01707433ee7dd7dd2d7e0b
parent b4013c83bee684a8f208fec8f09c286a32522c1d
author Bill Yi <byi@google.com> 1479695746 +0000
committer android-build-merger <android-build-merger@google.com> 1479695746 +0000

Import translations. DO NOT MERGE am: 2bfcd92a56  -s ours am: c530f91d8d  -s ours
am: b4013c83be  -s ours

Change-Id: Ib21972c9ae333143ce12e33e4f7175c799bcb69d