tree f31ff0a547ed9d57e266bf3b653ece3b7619d06d
parent 2c764b20e4a35c509f49e3d9430e135b4f3a0984
parent dc548483ae90ba26ad9e2e2cb79f4673140edb49
author Craig Mautner <cmautner@google.com> 1391648432 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391648432 +0000

am dc548483: Move activities from DisplayContent to TaskStack

* commit 'dc548483ae90ba26ad9e2e2cb79f4673140edb49':
  Move activities from DisplayContent to TaskStack