Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev

author Dianne Hackborn <hackbod@google.com>

Wed, 10 Dec 2014 21:56:07 +0000 (21:56 +0000)

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

Wed, 10 Dec 2014 21:56:08 +0000 (21:56 +0000)
author Dianne Hackborn <hackbod@google.com>
Wed, 10 Dec 2014 21:56:07 +0000 (21:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 10 Dec 2014 21:56:08 +0000 (21:56 +0000)
diff --cc services/core/java/com/android/server/am/ProcessList.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Wed, 10 Dec 2014 21:56:07 +0000 (21:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 10 Dec 2014 21:56:08 +0000 (21:56 +0000)