tree fa2201103038df5bca59cec32e3bfb0d2ba40df4
parent cfbc09aaee399fdf3441930de542853019a6e013
parent aa57e97dc8c419ac32d62ccbc83fbfd3a62b97bf
author Bill Yi <byi@google.com> 1490995712 +0000
committer android-build-merger <android-build-merger@google.com> 1490995712 +0000

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

Change-Id: I976c02812a9c66a291a34de15f8b93aebc923585