frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 2a36a778 to master	Hung-ying Tyan	2010-09-28	5	-3306/+0
\|\
\| *	am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." in...	Hung-ying Tyan	2010-09-27	5	-3316/+0
\| \|\
\| \| *	Merge "Move SipService out of SystemServer to phone process." into gingerbread	Hung-ying Tyan	2010-09-27	5	-3316/+0
\| \| \|\
\| \| \| *	Move SipService out of SystemServer to phone process.	Hung-ying Tyan	2010-09-28	5	-3316/+0
* \| \| \|	am d0cb228b: am 23142acf: Merge "squeeze a few more bits of randomness into /...	Nick Kralevich	2010-09-27	1	-0/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" i...	Nick Kralevich	2010-09-27	1	-0/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread	Nick Kralevich	2010-09-27	1	-0/+1
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	squeeze a few more bits of randomness into /dev/random	Nick Kralevich	2010-09-27	1	-0/+1
\| * \| \|	am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into g...	Dianne Hackborn	2010-09-27	2	-2/+34
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Allow all apps to call ContentResolver.getType()." into gingerbread	Dianne Hackborn	2010-09-27	2	-2/+34
\| \| \|\ \
\| \| \| * \|	Allow all apps to call ContentResolver.getType().	Dianne Hackborn	2010-09-26	2	-2/+34
* \| \| \| \|	Allow all apps to call ContentResolver.getType().	Dianne Hackborn	2010-09-27	2	-2/+34
* \| \| \| \|	Add support for transferring touch focus.	Jeff Brown	2010-09-27	1	-0/+25
* \| \| \| \|	am 45a83a89: am fccd5bc7: Fix build.	Hung-ying Tyan	2010-09-27	1	-0/+3
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am fccd5bc7: Fix build.	Hung-ying Tyan	2010-09-27	1	-0/+3
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Fix build.	Hung-ying Tyan	2010-09-28	1	-0/+3
* \| \| \| \|	am c5027642: am 025a39af: SIP: misc fixes	Hung-ying Tyan	2010-09-27	1	-25/+43
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 025a39af: SIP: misc fixes	Hung-ying Tyan	2010-09-27	1	-25/+43
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	SIP: misc fixes	Hung-ying Tyan	2010-09-28	1	-25/+43
* \| \| \| \|	am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error	Hung-ying Tyan	2010-09-27	1	-1/+19
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 00a22064: SipService: handle cross-domain authentication error	Hung-ying Tyan	2010-09-27	1	-1/+19
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	SipService: handle cross-domain authentication error	Hung-ying Tyan	2010-09-27	1	-1/+19
* \| \| \| \|	am 8f767774: am 465618ed: Merge "Use buffered output during packages.xml writ...	Kenny Root	2010-09-27	1	-2/+4
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 465618ed: Merge "Use buffered output during packages.xml write" into ginge...	Kenny Root	2010-09-27	1	-2/+4
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Use buffered output during packages.xml write	Kenny Root	2010-09-26	1	-2/+4
\| \| \|/ /
* \| \| \|	am ca25d2c3: am 4d94a766: Fixed some timeout and lock reentrance issues with ...	Jeff Brown	2010-09-24	1	-75/+129
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.	Jeff Brown	2010-09-24	1	-75/+129
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fixed some timeout and lock reentrance issues with broadcasts.	Jeff Brown	2010-09-24	1	-75/+129
* \| \| \|	am deaa8ff1: am a7ef18fc: Merge "Some debugging support." into gingerbread	Dianne Hackborn	2010-09-24	1	-1/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	am a7ef18fc: Merge "Some debugging support." into gingerbread	Dianne Hackborn	2010-09-24	1	-1/+4
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Some debugging support." into gingerbread	Dianne Hackborn	2010-09-24	1	-1/+4
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Some debugging support.	Dianne Hackborn	2010-09-24	1	-1/+4
* \| \| \|	am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for ca...	Hung-ying Tyan	2010-09-24	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 194bbcce: SIP: longer timeout for making call, shorter for cancelling	Hung-ying Tyan	2010-09-24	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	SIP: longer timeout for making call, shorter for cancelling	Hung-ying Tyan	2010-09-25	1	-1/+1
\| \| \|/
* \| \|	resolved conflicts for merge of 2d457a32 to master	Robert Greenwalt	2010-09-24	1	-96/+210
\|\ \ \ \| \|/ /
\| * \|	am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gin...	Robert Greenwalt	2010-09-24	1	-92/+198
\| \|\ \ \| \| \|/
\| \| *	Merge "Move long Connectivity tasks to handler thread." into gingerbread	Robert Greenwalt	2010-09-24	1	-92/+198
\| \| \|\
\| \| \| *	Move long Connectivity tasks to handler thread.	Robert Greenwalt	2010-09-23	1	-92/+198
* \| \| \|	am 33460d83: am 658bec95: SDP: remove dead code.	Chia-chi Yeh	2010-09-23	1	-1/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 658bec95: SDP: remove dead code.	Chia-chi Yeh	2010-09-23	1	-1/+0
\| \|\ \ \ \| \| \|/ /
\| \| * \|	SDP: remove dead code.	Chia-chi Yeh	2010-09-24	1	-1/+0
* \| \| \|	resolved conflicts for merge of ee813bae to master	Hung-ying Tyan	2010-09-24	3	-62/+63
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 84a357bb: Refactoring SIP classes to get ready for API review.	Hung-ying Tyan	2010-09-23	3	-62/+63
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Refactoring SIP classes to get ready for API review.	Hung-ying Tyan	2010-09-24	3	-62/+63
* \| \| \|	am 982c07e9: am cbb7b05e: Merge "Crash apps when they provide bad notificatio...	Joe Onorato	2010-09-23	1	-1/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of...	Joe Onorato	2010-09-23	1	-1/+3
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Crash apps when they provide bad notifications instead of crashing the...	Joe Onorato	2010-09-23	1	-1/+3
\| \| \|\ \
\| \| \| * \|	Crash apps when they provide bad notifications instead of crashing the system...	Joe Onorato	2010-09-23	1	-1/+3
* \| \| \| \|	am 1e2df14a: am f43ac911: Merge "Handle OPTIONS requests from SIP servers." i...	Chung-yih Wang	2010-09-23	1	-0/+6
\|\ \ \ \ \ \| \|/ / / /