tree cba62d0d64153aa2169651696bc238591341d679
parent df766cfcc5b5185dcb83648839cbde2f9a10b1de
parent b5b7fd3c3a2d5bdc540e1c508f2416155f85de18
author Nilesh Agrawal <nileshagrawal@google.com> 1414085559 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085559 +0000

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

* commit 'b5b7fd3c3a2d5bdc540e1c508f2416155f85de18':