tree 1468e6d59f6006d7a5d9eb20a8bd932a2c78edcf
parent 33ffa4f467279cd578dece82bf736127a060a539
parent f63c46bf5e304c36fc15fa4f15af9cb98fde762d
author Sunny Goyal <sunnygoyal@google.com> 1455819471 +0000
committer android-build-merger <android-build-merger@google.com> 1455819471 +0000

Merge "Revert "Temporarily disabling custom search controller"" into ub-launcher3-calgary
am: f63c46bf5e

* commit 'f63c46bf5e304c36fc15fa4f15af9cb98fde762d':
  Revert "Temporarily disabling custom search controller"