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

* commit 'c62eefa02aefb0bf3870e063aa47df6dccbf5862':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
This commit is contained in:
Victoria Lease
2013-01-18 10:53:48 -08:00
committed by Android Git Automerger

Diff Content Not Available