Hung-ying Tyan a57afb6a6c resolved conflicts for merge of 2a36a778 to master ...

Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3

2010-09-28 12:17:44 +08:00

..

am

am deaa8ff1: am a7ef18fc: Merge "Some debugging support." into gingerbread

2010-09-24 15:58:25 -07:00

app_process

…

backup

…

bmgr

…

bootanimation

…

bugreport

…

dumpstate

am deaa8ff1: am a7ef18fc: Merge "Some debugging support." into gingerbread

2010-09-24 15:58:25 -07:00

dumpsys

…

ime

…

input

…

installd

Allow installd to handle large partitions

2010-09-07 14:35:47 -07:00

keystore

…

pm

…

rawbu

…

runtime

…

screencap

new screencap command

2010-09-26 19:11:04 -07:00

screenshot

…

service

…

servicemanager

am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread

2010-09-27 16:29:33 -07:00

stagefright

Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.

2010-09-24 10:09:00 -07:00

surfaceflinger

…

svc

Track client requests through location manager.

2010-09-13 14:20:48 -07:00

system_server

…