Victoria Lease 79d59f0968 DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care. ...

Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03

Conflicts:

	services/java/com/android/server/ServiceWatcher.java

2013-01-16 17:37:21 -08:00

..

common_time

am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."

2012-09-12 11:08:45 -07:00

input

Eliminate potential reentrance from unregisterInputChannel.

2012-10-31 19:01:31 -07:00

java

DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.

2013-01-16 17:37:21 -08:00

jni

Fix a segfault when there is no power module.

2012-10-09 14:47:05 -07:00

tests/servicestests

Fix build.

2012-11-28 18:46:45 -08:00