Andreas Huber ea427b0c87 resolved conflicts for merge of 26f70db9 to master ...

Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120

2011-11-08 10:40:20 -08:00

..

am

Various performance and other work.

2011-10-31 16:52:34 -07:00

app_process

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

backup

…

bmgr

Can now restore a subset of apps from historical dataset

2011-07-08 12:28:48 -07:00

bootanimation

boot animation doesn't use EGLUtils anymore

2011-08-15 15:25:39 -07:00

bu

Add -nosystem flag to adb backup

2011-10-04 15:35:00 -07:00

bugreport

Remove the simulator target from all makefiles.

2011-07-11 22:12:16 -07:00

dumpstate

Include showmap output in bug report.

2011-11-03 19:19:28 -07:00

dumpsys

…

ime

…

input

…

installd

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

ip-up-vpn

ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty.

2011-09-22 10:53:05 -07:00

keystore

Remove the simulator target from all makefiles.

2011-07-11 22:12:16 -07:00

pm

Infrastructure to support package verifier

2011-08-15 17:26:31 -07:00

rawbu

Remove the simulator target from all makefiles.

2011-07-11 22:12:16 -07:00

screencap

…

screenshot

Remove the simulator target from all makefiles.

2011-07-11 22:12:16 -07:00

sensorservice

…

service

…

servicemanager

Remove the simulator target from all makefiles.

2011-07-11 22:12:16 -07:00

stagefright

resolved conflicts for merge of 26f70db9 to master

2011-11-08 10:40:20 -08:00

surfaceflinger

…

svc

…

system_server

Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build

2011-07-13 19:45:44 -04:00