Andreas Huber f314276df5 resolved conflicts for merge of 6e80c50f to ics-aah ...

Conflicts:
	media/libmediaplayerservice/MediaPlayerService.cpp

Change-Id: Icb9371dcace4609fffd048b7fdc27ee59d589a92

2011-10-13 12:59:54 -07:00

..

am

Add the ability to pass float extras to AM.

2011-08-24 18:37:50 -07:00

app_process

…

backup

…

bmgr

…

bootanimation

…

bu

Add -nosystem flag to adb backup

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

bugreport

…

dumpstate

dumpstate: add uptime to top of bugreports

2011-09-20 15:51:15 -07:00

dumpsys

…

ime

…

input

…

installd

…

ip-up-vpn

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

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

keystore

…

pm

Infrastructure to support package verifier

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

rawbu

…

screencap

…

screenshot

…

sensorservice

…

service

…

servicemanager

Add service/aah_timesrv

2011-08-25 18:24:52 -07:00

stagefright

NuPlayer is now taking on the task of streaming over RTSP.

2011-10-13 11:31:06 -07:00

surfaceflinger

…

svc

…

system_server

…