tree 36e27a9a20a7fc29e5399f8c352c694587a61301
parent a5d631ccdcb73b216269bba1daf443807b9f726c
parent f90553cd5f32f3fb93a57a57382f56908af503c0
author Bill Yi <byi@google.com> 1501997951 +0000
committer android-build-merger <android-build-merger@google.com> 1501997951 +0000

Import translations. DO NOT MERGE am: 33ea767647  -s ours
am: f90553cd5f  -s ours

Change-Id: Icc21889490ec4822269e2fe3f665366408d31330