tree 67c70e9d21fcd59ea194fb4a369945cd17bf3312
parent 13a0fd4e853c9b43790d11c1e81dcd9c400e926e
parent 9fb583d7ea8fcfbdce83f6fbafe93f03b34d00e9
author Bill Yi <byi@google.com> 1496520965 +0000
committer android-build-merger <android-build-merger@google.com> 1496520965 +0000

Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval am: ce338fca12  -s ours
am: 9fb583d7ea  -s ours

Change-Id: I1afd846b08341d155d59273f394e67d756966b1b