Merge "Fix issue #17507017: took ~3 seconds to move an app to the foreground" into...

author Dianne Hackborn <hackbod@google.com>

Wed, 17 Sep 2014 00:14:43 +0000 (00:14 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 17 Sep 2014 00:14:44 +0000 (00:14 +0000)
author Dianne Hackborn <hackbod@google.com>
Wed, 17 Sep 2014 00:14:43 +0000 (00:14 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Sep 2014 00:14:44 +0000 (00:14 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Wed, 17 Sep 2014 00:14:43 +0000 (00:14 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Sep 2014 00:14:44 +0000 (00:14 +0000)