Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into...

author Wale Ogunwale <ogunwale@google.com>

Tue, 12 May 2015 17:39:58 +0000 (17:39 +0000)

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

Tue, 12 May 2015 17:40:17 +0000 (17:40 +0000)
author Wale Ogunwale <ogunwale@google.com>
Tue, 12 May 2015 17:39:58 +0000 (17:39 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 12 May 2015 17:40:17 +0000 (17:40 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
author	Wale Ogunwale <ogunwale@google.com>
	Tue, 12 May 2015 17:39:58 +0000 (17:39 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 12 May 2015 17:40:17 +0000 (17:40 +0000)