tree 7983af15a6ad9718632913bc45aa8685fc8ad7f1
parent 779dc5aa7bdac5f899bc4a1904b10480abc3ed00
parent 579c8433f968fd8235527865797f8d58c20487da
author Nilesh Agrawal <nileshagrawal@google.com> 1388788223 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388788223 -0800

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.