Commits
Victoria Lease authored and Android Git Automerger committed f25febf0145M
am 00ef2a36: (-s ours) 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 '00ef2a3622baa477d7dfdd8df7d68bab84008b4d': DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
Showing diff to52dda54b081