tree 0374c4a19a8b8e3851141627f93dab6b522c30d8
parent ee1e0621f7048215be0a51fb93a4e7ff2218f054
parent 01d760eb1979d5846ef4b5177586b3a6524339aa
author Bill Yi <byi@google.com> 1508230582 +0000
committer android-build-merger <android-build-merger@google.com> 1508230582 +0000

Import translations. DO NOT MERGE am: 495713d814  -s ours am: 20b87b03c9  -s ours
am: 01d760eb19  -s ours

Change-Id: I036ed0964eecebb69ef2d2f1a996b88074f7e469