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