tree d55f81ae591200c579cd7f336086b74eaa02ea56
parent 4d70b69d7acd5897b318e06840f6addefe5649b4
parent 0446865d68f82e956479b0e0db80505c85774e3a
author Bill Yi <byi@google.com> 1484801511 +0000
committer android-build-merger <android-build-merger@google.com> 1484801511 +0000

Import translations. DO NOT MERGE
am: 0446865d68  -s ours

Change-Id: I389d6dd23abc7e3476d00a25ab958d1de44b7e09