tree bba1c61e3a35f7dc5db56f3cf8f9621336e476a2
parent 4c355d746df3caf2ccac7a401d586706843783be
parent 4a32ddb33ffc5b46e897db0b73313625f217cfdc
author Bill Yi <byi@google.com> 1502083572 +0000
committer android-build-merger <android-build-merger@google.com> 1502083572 +0000

Import translations. DO NOT MERGE am: 9354ca48fb  -s ours
am: 4a32ddb33f  -s ours

Change-Id: I3dceb58c3cdfb458170b017cbd6452e72a18c087