| commit | f25febf01453733e8bdd1ac241ecd9d3bcbef475 | [log] [tgz] |
|---|---|---|
| author | Victoria Lease <violets@google.com> | Fri Jan 18 10:57:06 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 18 10:57:06 2013 -0800 |
| tree | a59f079c0d412438594edf60e5ca4c7e2acf9d9a | |
| parent | 52dda54b081f3a3fb1cc475128eec820e3d5b21e [diff] | |
| parent | 00ef2a3622baa477d7dfdd8df7d68bab84008b4d [diff] |
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.