tree 10da860fcff71886af91d082e31f0e1917926848
parent f4cfade1fa5c5e5aff5745d8813a59a547d77492
parent d85a790fe4f828eed03eb6fe02343624657c8c28
author Winson Chung <winsonc@google.com> 1414566393 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566393 +0000

am d85a790f: am fe712898: am 89524f48: am 17bde09a: Merge "Retain current AllApps page if we never leave Launcher. (Bug 11468582)" into jb-ub-now-kermit

* commit 'd85a790fe4f828eed03eb6fe02343624657c8c28':