tree 7f9622b0e83c4f4fd2ebd40134140d5f1aac44a2
parent dca1747735806ae03245c92e747656db8a3e4f2a
parent f94068462649986dad263f28226be6c514af47d3
author Sunny Goyal <sunnygoyal@google.com> 1455909333 +0000
committer android-build-merger <android-build-merger@google.com> 1455909333 +0000

resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary
am: f940684626

* commit 'f94068462649986dad263f28226be6c514af47d3':
  Wrapping thw widgetList inside a layout, so that it has the same view structure as allApps