tree d2162e3b1b967c997dbaf558793d2740124dac9e
parent eb870e154a7e13ccc775fa6ab0c00a3fb6acd845
parent 579c8433f968fd8235527865797f8d58c20487da
author Nilesh Agrawal <nileshagrawal@google.com> 1392410333 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410333 +0000

am 579c8433: Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit

* commit '579c8433f968fd8235527865797f8d58c20487da':
  Allow scrolling folders in when all apps is disabled.