tree ed42e54c33ab49e176491b6f7332b4bd287a798a
parent 88818ab2df2a0b2f665221d803ff49ce4682f07d
parent 17bde09a9e9bc4113d9763ccf827307509c04aef
author Winson Chung <winsonc@google.com> 1392410306 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410306 +0000

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

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