tree 0678a46a70898d884d7a002389bcf0e9a03ca6f2
parent d2bd0acdb2674089595633c75b6dc119799486b3
parent 3c0aa4ca74fe64838bf8ab759ca902e367ab5911
author Bill Yi <byi@google.com> 1491122311 +0000
committer android-build-merger <android-build-merger@google.com> 1491122311 +0000

Import translations. DO NOT MERGE am: e344fd847c  -s ours
am: 3c0aa4ca74  -s ours

Change-Id: I48196779d3012cc97f423c9fe79229b86e40e7ad