tree 5028327a29a67ca0276d65393a18c5b8a159596d
parent cdb0cd4ec83ff15bb1405439e72e282e8121fc0c
parent 05d82e887a9095092d83068d30221da62272414a
author Bill Yi <byi@google.com> 1506010747 +0000
committer android-build-merger <android-build-merger@google.com> 1506010747 +0000

Import translations. DO NOT MERGE am: 50e19c566e  -s ours am: e708378dc9  -s ours
am: 05d82e887a  -s ours

Change-Id: Ie960ff87958349e40171a1205dc67794fcf27826