tree c84cfde1d4049b294250cb60fa9611b4301ea65a
parent 8ae90587a510f72a176119b1f23add8bc36285b9
parent 512141d581133ad5c1712ac097dcee08d46bae2c
author Wale Ogunwale <ogunwale@google.com> 1441300662 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441300662 +0000

am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev

* commit '512141d581133ad5c1712ac097dcee08d46bae2c':
  Respect DONT_KILL_APP flag when bringing down a disabled service.