tree cbfa08fd70827b4696b78366b2ccd123ba1c8dd2
parent c24021e3de84506fd7feb5c521d27283b50f6aab
parent 89524f48e52a25e18e1d918e96d43c6db9a3deec
author Winson Chung <winsonc@google.com> 1392411261 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411261 +0000

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

* commit '89524f48e52a25e18e1d918e96d43c6db9a3deec':
  Retain current AllApps page if we never leave Launcher. (Bug 11468582)