tree 1baa232cc6c4333f68e40e2e30bc86a8c930645d
parent 5aff865629e92af997cc0429df1c4b258b1527a5
parent e8c47188b66501b34d7cbf8eadcbb60f3d673d34
author Bill Yi <byi@google.com> 1508521380 +0000
committer android-build-merger <android-build-merger@google.com> 1508521380 +0000

Import translations. DO NOT MERGE am: 85a89c64b4  -s ours am: 787a8369d1  -s ours
am: e8c47188b6  -s ours

Change-Id: I681843a830f576798a1c15494b4c77db1e85af22