tree e2451788a5bfc46dc2f0fb501588d9005d73728c
parent e2e5eab102d8040f867abb158909ad5a0929edc6
parent 3720c69322210e2e196ad93bf856eadc3a956177
author Tony Wickham <twickham@google.com> 1495222715 +0000
committer android-build-merger <android-build-merger@google.com> 1495222715 +0000

resolve merge conflicts of 8af16760d to ub-launcher3-dorval-polish
am: 3720c69322

Change-Id: I16572c451a08359d84d8bc05e0e39dcd88b65a7e