tree cba62d0d64153aa2169651696bc238591341d679
parent 807748a96c70744ba796afaf68d103dc36e406c5
parent fe71289896386326de86c225e9b7aec51f15c4cc
author Winson Chung <winsonc@google.com> 1414085521 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085521 +0000

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

* commit 'fe71289896386326de86c225e9b7aec51f15c4cc':