tree ae50b5909fe347cb0f2db2d0f9918efaec257ca6
parent 2140c5490b23399c1f8ceb50ddf90a75006519d1
parent c2f9e4323cda3090cfa9197eb402f9279a72b224
author Wale Ogunwale <ogunwale@google.com> 1441306320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441306320 +0000

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

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