tree 18e48651b6e3b4924e21154c3e383404dd5d2d1e
parent a239b933f7982ed069ccd284b4eab0fb5e4b6505
parent 79d59f0968ffcb803f615527d52718322af0f89b
author Victoria Lease <violets@google.com> 1358534556 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1358534591 +0000

Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev