tree 687b41f39adc1434ac6667f847164f05fdc71dca
parent 87e19e35adbc8d7c4434f585a66e9710907f5a83
parent ce338fca124ecc3f764be23939c9c4859a66e5c0
author Bill Yi <byi@google.com> 1496520695 +0000
committer android-build-merger <android-build-merger@google.com> 1496520695 +0000

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

Change-Id: I62eb73d303cb622461a72599910aeee6db72fe4a