tree fc5603af916a4100ff58dea6eb806dfab83e601a
parent 7d55a9364af5e4d5e8e73c2fd5632ecb19766bea
parent 7e9e5e20f0d03647f7a115e76b921dd08fddde3f
author Winson Chung <winsonc@google.com> 1339196432 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339196432 -0700

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

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