am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev

author Craig Mautner <cmautner@google.com>

Wed, 1 Oct 2014 22:36:47 +0000 (22:36 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 1 Oct 2014 22:36:47 +0000 (22:36 +0000)
author Craig Mautner <cmautner@google.com>
Wed, 1 Oct 2014 22:36:47 +0000 (22:36 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 22:36:47 +0000 (22:36 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java

index c7b9d96,e1b8278..e1b8278

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	Craig Mautner <cmautner@google.com>
	Wed, 1 Oct 2014 22:36:47 +0000 (22:36 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 1 Oct 2014 22:36:47 +0000 (22:36 +0000)