tree 10da860fcff71886af91d082e31f0e1917926848
parent 2803536e2f103b4a7d4968bd0a4065465061e4c1
parent 93cdc5236fa02061d8b68e93efeccb375c446710
author Nilesh Agrawal <nileshagrawal@google.com> 1414566454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566454 +0000

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

* commit '93cdc5236fa02061d8b68e93efeccb375c446710':