tree cbfa08fd70827b4696b78366b2ccd123ba1c8dd2
parent d12c70238acd45bd2aa48d26790240465546c30e
parent fe71289896386326de86c225e9b7aec51f15c4cc
author Winson Chung <winsonc@google.com> 1392411738 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411738 +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':
  Retain current AllApps page if we never leave Launcher. (Bug 11468582)