OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d59e0e
0cf97d3
)
am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under Servi...
author
Victoria Lease
<violets@google.com>
Fri, 18 Jan 2013 18:49:07 +0000
(10:49 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 18 Jan 2013 18:49:07 +0000
(10:49 -0800)
* commit '
0cf97d32178b689184866e731c0a4105d8223d80
':
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
Trivial merge