Merge "Fix issue #11050678: Large memory leak in ActivityStack" into klp-dev

author Dianne Hackborn <hackbod@google.com>

Sun, 6 Oct 2013 20:28:47 +0000 (20:28 +0000)

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

Sun, 6 Oct 2013 20:28:47 +0000 (20:28 +0000)
author Dianne Hackborn <hackbod@google.com>
Sun, 6 Oct 2013 20:28:47 +0000 (20:28 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sun, 6 Oct 2013 20:28:47 +0000 (20:28 +0000)
diff --cc services/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Sun, 6 Oct 2013 20:28:47 +0000 (20:28 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sun, 6 Oct 2013 20:28:47 +0000 (20:28 +0000)