tree 328b17ea7c57b1b4aa58ca85614bbdc2693b7cd3
parent f97932256bf51f1e5d944bd18754fadd4626dd51
parent 2a53cb7a5e86920fdc9063ddf3966af5d5472c56
author Winson Chung <winsonc@google.com> 1430787839 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430787839 +0000

am 2a53cb7a: Merge "Launcher-side changes to support prediction bar." into ub-launcher3-burnaby

* commit '2a53cb7a5e86920fdc9063ddf3966af5d5472c56':
  Launcher-side changes to support prediction bar.