tree 8140f05339e691942186248f982f8ba1252ecfa6
parent 0f4fe0f1d55e6bf1940b1273de2266abf814bc03
parent 95b192365c3ac4c618014b3ba600afd42d0f793f
author Bill Yi <byi@google.com> 1479692365 +0000
committer android-build-merger <android-build-merger@google.com> 1479692365 +0000

Import translations. DO NOT MERGE am: cd1c178395  -s ours am: a3aa0dc5db  -s ours
am: 95b192365c  -s ours

Change-Id: I7c76446533d40861d94606fa1d19040eebb7fdc6