tree af358973f599121a89c92b7a8c217700b5efc174
parent 7e68abc44078fa642c245e607f4f7958d0f5468e
parent 21b0141dbed84b25c41ca75bc152122f366fbdc7
author Bill Yi <byi@google.com> 1494497392 +0000
committer android-build-merger <android-build-merger@google.com> 1494497392 +0000

Import translations. DO NOT MERGE
am: 21b0141dbe  -s ours

Change-Id: I394a75fda00489c9ef4bc9fa625fa0cbb0db5dc4