tree b1dd15946e26f959b04c5eef3a9ac2d27ab990e8
parent c9b937bbfae825e32158e06ca52f320ca3d6f464
parent 155e3133407e590f18e7e16eddc6fc743f35b0fd
author Craig Mautner <cmautner@google.com> 1396047942 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396047942 +0000

am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."

* commit '155e3133407e590f18e7e16eddc6fc743f35b0fd':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.