tree cdb92a5ee04d30dd93edd6d798840cdbe35791aa
parent d505fb79174a2165b3babf09222f805f87a2b2b8
parent 34e7003a78005e86326c86345561e986978723c6
author Dianne Hackborn <hackbod@google.com> 1418084219 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418084219 +0000

am 34e7003a: am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev

* commit '34e7003a78005e86326c86345561e986978723c6':
  Fix issue #18593636: Turn on "kill important processes that...