tree e9ba03541afb063ba5ffc930a2371658f99c999c
parent deb0e04164cc124be84b9f2e25dd3e10d1229f32
parent 70cbd2cdb9748bc2e050a325804f7f4d5f89afc1
author The Android Open Source Project <initial-contribution@android.com> 1493732959 +0000
committer android-build-merger <android-build-merger@google.com> 1493732959 +0000

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

Change-Id: Id6255fb06ae223474ed44a2eb045c0634d292036