tree 786be9c4a962819c2c15c1654054617b8ee8f06e
parent f94ea63942e22b2cdc47a04e232f94df9a31ba4e
parent a74148ea54758899b6f7ea37eaf65cbaaac17b9b
author Bill Yi <byi@google.com> 1476769530 +0000
committer android-build-merger <android-build-merger@google.com> 1476769530 +0000

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: a74148ea54  -s ours

Change-Id: I6925457da9d330406fae0505bac1c3369d354320