tree fc5603af916a4100ff58dea6eb806dfab83e601a
parent f75a2cf06c67ec376c435ff0c88785de6dd2d822
parent 5262bb3c4c4cd4fb566a5003154fa97edcde138b
author Winson Chung <winsonc@google.com> 1339196315 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339196315 -0700

am 5262bb3c: Merge "Fixing regression in transition after returning to home from another app. (Bug 6629707)" into jb-dev

* commit '5262bb3c4c4cd4fb566a5003154fa97edcde138b':
  Fixing regression in transition after returning to home from another app. (Bug 6629707)