OSDN Git Service

am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death...
authorVictoria Lease <violets@google.com>
Fri, 18 Jan 2013 18:51:25 +0000 (10:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Jan 2013 18:51:25 +0000 (10:51 -0800)
commitc62eefa02aefb0bf3870e063aa47df6dccbf5862
tree893e6a03b022f544e25717076cfe294c73f80024
parent5287cd7476e0096f5f36866f81b47950343e4155
parent3599f0a02129c238177806ce3d6db20853230d4d
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 '3599f0a02129c238177806ce3d6db20853230d4d':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.