tree 8dc5ee6d26a788ac5598a3f89408df4e5f9f6161
parent 95e465f1fdbc3fc903ec6a4067caed1b4876a8be
parent b5b7fd3c3a2d5bdc540e1c508f2416155f85de18
author Nilesh Agrawal <nileshagrawal@google.com> 1392411771 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411771 +0000

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

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