frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 5df4b5a7 to master	Jean-Baptiste Queru	2010-10-10	1	-2/+8
\|\
\| *	am 08fb5851: Merge "Add flag to skip restoring network seletion." into ginger...	John Wang	2010-10-07	1	-2/+8
\| \|\
\| \| *	Add flag to skip restoring network seletion.	John Wang	2010-10-07	1	-2/+8
* \| \|	am 2e99245e: am bbc80d34: Merge "Changed handling of onQueryCompelete to not ...	Wink Saville	2010-10-10	1	-18/+18
\|\ \ \ \| \|/ /
\| * \|	am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType....	Wink Saville	2010-10-07	1	-18/+18
\| \|\ \ \| \| \|/
\| \| *	Changed handling of onQueryCompelete to not use mimeType.	Wink Saville	2010-10-07	1	-18/+18
* \| \|	am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing c...	Hung-ying Tyan	2010-10-08	2	-17/+34
\|\ \ \ \| \|/ /
\| * \|	am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gin...	Hung-ying Tyan	2010-10-05	2	-17/+34
\| \|\ \ \| \| \|/
\| \| *	Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread	Hung-ying Tyan	2010-10-05	2	-17/+34
\| \| \|\
\| \| \| *	CallManager/SipPhone: fix reject a ringing call	Hung-ying Tyan	2010-10-06	2	-17/+34
\| \| * \|	Merge changes Ic5551c94,I0207f7f7 into gingerbread	Mike Lockwood	2010-10-05	2	-0/+7
\| \| \|\ \
\| \| \| * \|	GPS: Add support for AGpsRilInterface.	Miguel Torroja	2010-10-05	2	-0/+7
\| \| \| \|/
\| * \| \|	am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread	Robert Greenwalt	2010-10-05	1	-13/+15
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Add supporting MCC=450(Korea)" into gingerbread	Robert Greenwalt	2010-10-05	1	-13/+15
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Add supporting MCC=450(Korea)	Sang-il, Lee	2010-10-01	1	-13/+15
* \| \| \|	am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." int...	Hung-ying Tyan	2010-10-06	2	-0/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread	Hung-ying Tyan	2010-10-04	2	-0/+4
\| \|\ \ \ \| \| \|/ /
\| \| * \|	SIP: add SERVER_UNREACHABLE error code.	Hung-ying Tyan	2010-10-05	2	-0/+4
* \| \| \|	Add LinkAddress	Irfan Sheriff	2010-10-06	1	-17/+17
* \| \| \|	Revert "Revert "resolved conflicts for merge of 8788d140 to master""	Hung-ying Tyan	2010-10-03	8	-720/+49
* \| \| \|	Revert "resolved conflicts for merge of 8788d140 to master"	Jason Chen	2010-10-01	8	-48/+720
* \| \| \|	resolved conflicts for merge of 8788d140 to master	Hung-ying Tyan	2010-10-02	8	-720/+48
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 306137d9: SIP telephony cleanup.	Hung-ying Tyan	2010-10-01	8	-716/+48
\| \|\ \ \ \| \| \|/ /
\| \| * \|	SIP telephony cleanup.	Hung-ying Tyan	2010-10-02	8	-716/+48
* \| \| \|	resolved conflicts for merge of 3543a40b to master	Jake Hamby	2010-10-01	3	-9/+58
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 7888486d: Merge "Add subaddress to SMS fingerprint calculation."	Jake Hamby	2010-10-01	3	-9/+58
\| \|\ \ \
\| \| * \ \	Merge "Add subaddress to SMS fingerprint calculation."	Jake Hamby	2010-10-01	3	-9/+58
\| \| \|\ \ \
\| \| \| * \| \|	Add subaddress to SMS fingerprint calculation.	Naveen Kalla	2010-09-26	3	-9/+58
* \| \| \| \| \|	am edec27a1: am d531c9eb: Merge "Do not explicity disconnect Data during powe...	Jake Hamby	2010-10-01	1	-20/+41
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."	Jake Hamby	2010-10-01	1	-20/+41
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Do not explicity disconnect Data during power down for 1x.	Naveen Kalla	2010-09-20	1	-20/+41
\| \| \|/ / /
* \| \| \| \|	am 86a12d46: am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnab...	Hung-ying Tyan	2010-10-01	5	-0/+46
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into ...	Hung-ying Tyan	2010-10-01	5	-0/+46
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread	Hung-ying Tyan	2010-10-01	5	-0/+46
\| \| \|\ \ \
\| \| \| * \| \|	Add CallManager/Phone.setEchoSuppressionEnabled().	Hung-ying Tyan	2010-09-30	5	-0/+46
\| \| \| \| \|/ \| \| \| \|/\|
* \| \| \| \|	resolved conflicts for merge of 6a3eddb4 to master	Dianne Hackborn	2010-09-30	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread	Dianne Hackborn	2010-09-30	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Rub in a little 'ol log-b-gone." into gingerbread	Dianne Hackborn	2010-09-30	1	-1/+1
\| \| \|\ \ \
\| \| \| * \| \|	Rub in a little 'ol log-b-gone.	Dianne Hackborn	2010-09-30	1	-1/+1
\| \| \| \|/ /
* \| \| \| \|	resolved conflicts for merge of 738aadd7 to master	Jake Hamby	2010-09-30	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp	Jake Hamby	2010-09-30	3	-7/+7
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Typo fixes in comments and minor code cleanups.	Jake Hamby	2010-09-30	3	-7/+7
\| \| \|/ /
* \| \| \|	am 49c13e51: am 0e412304: Catch exceptions in SipPhone.canTake().	Hung-ying Tyan	2010-09-30	1	-8/+26
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 0e412304: Catch exceptions in SipPhone.canTake().	Hung-ying Tyan	2010-09-30	1	-8/+26
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Catch exceptions in SipPhone.canTake().	Hung-ying Tyan	2010-09-30	1	-8/+26
* \| \| \|	am 2c457326: am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnect...	Hung-ying Tyan	2010-09-30	1	-11/+21
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection.	Hung-ying Tyan	2010-09-30	1	-11/+21
\| \|\ \ \ \| \| \|/ /
\| \| * \|	SipPhone: revise hangup() in SipCall and SipConnection.	Hung-ying Tyan	2010-09-30	1	-11/+21
* \| \| \|	am 5cf44f69: am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for in...	David Brown	2010-09-30	1	-14/+80
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP ca...	David Brown	2010-09-29	1	-14/+80
\| \|\ \ \ \| \| \|/ /