tree 3c480da735797176adf0f13936df6bf62be5b824
parent 172fee6354ce4ac36beb7c9788036b7a31d7da08
parent 90edbf8409689229b0d88472ef972c899a0f0c60
author Winson Chung <winsonc@google.com> 1428624318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428624318 +0000

am 90edbf84: Merge "Initial changes to support a fixed all-apps layout." into ub-launcher3-burnaby

* commit '90edbf8409689229b0d88472ef972c899a0f0c60':
  Initial changes to support a fixed all-apps layout.