tree 6f314c09bbeb6e3195b5ab1d037b1eaf02bfeeac
parent db67e7c7a354cdfdf4473a9087f39633fbb4dc7e
parent 82eb1f0ea682b896ab35d2f25ebaaae29a37b45c
author Tony Wickham <twickham@google.com> 1493841549 -0700
committer Tony Wickham <twickham@google.com> 1493841549 -0700

resolve merge conflicts of 82eb1f0ea to ub-launcher3-dorval-polish

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1f6ace04ec2c11206276df76ef7a20df545d604