am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services...
am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev
* commit '0cf97d32':
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.