tree cc177233e85c014d6a656c45517fd8a9f6e840ec
parent ac872db915e37173f7e6c1cbfdbda24298025034
parent 45cef0caa13201c283cc0262b6264ee780b12dc9
author Bill Yi <byi@google.com> 1491105644 +0000
committer android-build-merger <android-build-merger@google.com> 1491105644 +0000

Import translations. DO NOT MERGE am: df86273b79  -s ours
am: 45cef0caa1  -s ours

Change-Id: Ide33997777ac5298fcfebd15d818348a62993211