Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev

author Craig Mautner <cmautner@google.com>

Thu, 4 Dec 2014 21:51:55 +0000 (21:51 +0000)

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

Thu, 4 Dec 2014 21:52:06 +0000 (21:52 +0000)
author Craig Mautner <cmautner@google.com>
Thu, 4 Dec 2014 21:51:55 +0000 (21:51 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 4 Dec 2014 21:52:06 +0000 (21:52 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Craig Mautner <cmautner@google.com>
	Thu, 4 Dec 2014 21:51:55 +0000 (21:51 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 4 Dec 2014 21:52:06 +0000 (21:52 +0000)