OSDN Git Service

am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under Servi...
authorVictoria Lease <violets@google.com>
Fri, 18 Jan 2013 18:49:07 +0000 (10:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Jan 2013 18:49:07 +0000 (10:49 -0800)
commit3599f0a02129c238177806ce3d6db20853230d4d
tree85f047b9b3a75e01e1680ce7467d6e5a25e47452
parent6d59e0ead242978eff8a64d314a1f8554694d8a6
parent0cf97d32178b689184866e731c0a4105d8223d80
am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev

* commit '0cf97d32178b689184866e731c0a4105d8223d80':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.