tree 9e13bb5c647ecfdb2fddaea2fbf04a9a3207a81a
parent 2f45ef21cbb2aa2b1c4376363e1663024bf09509
parent 0ecf5bcfcb329728231c2289f0ade8a0830860a9
author Tony Wickham <twickham@google.com> 1496963122 +0000
committer android-build-merger <android-build-merger@google.com> 1496963122 +0000

resolve merge conflicts of 7092db024 to ub-launcher3-dorval-polish
am: 0ecf5bcfcb

Change-Id: I53fe694e3fc1c68363cb15ae0f6dbe8097cdcade