tree 9d2bed02cc699b02d5b24ca983a1e2d3e577fa79
parent 8eb5b17877138e80b5ff59d29d11165e90eb5a66
parent 97660f7a9421b4d9068183b6fb1ec107df8c7946
author Sunny Goyal <sunnygoyal@google.com> 1457042125 +0000
committer android-build-merger <android-build-merger@google.com> 1457042125 +0000

resolve merge conflicts of 2494c3f168 to ub-launcher3-calgary
am: 97660f7a94

* commit '97660f7a9421b4d9068183b6fb1ec107df8c7946':
  Moving createMarketSearchIntent to search controller to allow it to be customizable