Always take an activity screenshot when pausing. automerge: 37f2718

author Wale Ogunwale <ogunwale@google.com>

Wed, 10 Dec 2014 01:00:52 +0000 (01:00 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 10 Dec 2014 01:00:52 +0000 (01:00 +0000)
author Wale Ogunwale <ogunwale@google.com>
Wed, 10 Dec 2014 01:00:52 +0000 (01:00 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 10 Dec 2014 01:00:52 +0000 (01:00 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java

index 02b45a3,efed0b9..9507958

mode 100644,100755..100644
--- 1/services/core/java/com/android/server/am/ActivityStack.java
--- 2/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
author	Wale Ogunwale <ogunwale@google.com>
	Wed, 10 Dec 2014 01:00:52 +0000 (01:00 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 10 Dec 2014 01:00:52 +0000 (01:00 +0000)