frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerb...	Eric Laurent	2010-10-26	1	-1/+1
\|\
\| *	am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread	Eric Laurent	2010-10-26	1	-1/+1
\| \|\
\| \| *	Partial fix for issue 3124895.	Eric Laurent	2010-10-25	1	-1/+1
* \| \|	am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP ...	John Huang	2010-10-21	1	-3/+3
\|\ \ \ \| \|/ /
\| * \|	am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into ...	John Huang	2010-10-21	1	-3/+3
\| \|\ \ \| \| \|/
\| \| *	Fix connect duration for un-established SIP calls.	Hung-ying Tyan	2010-10-21	1	-3/+3
* \| \|	am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone.	Hung-ying Tyan	2010-10-21	1	-3/+20
\|\ \ \ \| \|/ /
\| * \|	am 6037a056: Fix n-way conf call in SipPhone.	Hung-ying Tyan	2010-10-20	1	-3/+20
\| \|\ \ \| \| \|/
\| \| *	Fix n-way conf call in SipPhone.	Hung-ying Tyan	2010-10-21	1	-3/+20
* \| \|	am e55806a5: am 23392a84: Fix the build.	Jeff Hamilton	2010-10-21	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	am 23392a84: Fix the build.	Jeff Hamilton	2010-10-20	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	Fix the build.	Jeff Hamilton	2010-10-20	1	-1/+1
* \| \|	am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails an...	Hung-ying Tyan	2010-10-21	2	-0/+34
\|\ \ \ \| \|/ /
\| * \|	am 6fe795ec: Do another contact lookup if the first one fails and...	Hung-ying Tyan	2010-10-20	2	-0/+34
\| \|\ \ \| \| \|/
\| \| *	Do another contact lookup if the first one fails and...	Hung-ying Tyan	2010-10-21	2	-0/+34
* \| \|	am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another ...	Hung-ying Tyan	2010-10-21	1	-2/+20
\|\ \ \ \| \|/ /
\| * \|	am baced375: Merge "Silently reject a ringing call when another call is diali...	Hung-ying Tyan	2010-10-20	1	-2/+20
\| \|\ \ \| \| \|/
\| \| *	Silently reject a ringing call when another call is dialing/ringing.	Hung-ying Tyan	2010-10-21	1	-2/+20
* \| \|	am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into...	Hung-ying Tyan	2010-10-21	1	-1/+0
\|\ \ \ \| \|/ /
\| * \|	am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread	Hung-ying Tyan	2010-10-20	1	-1/+0
\| \|\ \ \| \| \|/
\| \| *	Remove ringtone API from SipAudioCall.	Hung-ying Tyan	2010-10-20	1	-1/+0
* \| \|	am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnap...	Hung-ying Tyan	2010-10-21	1	-0/+13
\|\ \ \ \| \|/ /
\| * \|	am b595e094: Merge "Return display name in SipConnection.getCnapName()." into...	Hung-ying Tyan	2010-10-19	1	-0/+13
\| \|\ \ \| \| \|/
\| \| *	Merge "Return display name in SipConnection.getCnapName()." into gingerbread	Hung-ying Tyan	2010-10-19	1	-0/+13
\| \| \|\
\| \| \| *	Return display name in SipConnection.getCnapName().	Hung-ying Tyan	2010-10-20	1	-0/+13
* \| \| \|	resolved conflicts for merge of 368fdba4 to master	Brad Fitzpatrick	2010-10-21	1	-24/+17
\|\ \ \ \ \| \|/ / /
\| * \| \|	am bdf1706a: Merge "Reduce logging." into gingerbread	Joe Onorato	2010-10-19	1	-24/+17
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Reduce logging.	Joe Onorato	2010-10-19	1	-24/+17
\| \| \|/
* \| \|	am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user ...	David Brown	2010-10-15	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPS...	David Brown	2010-10-13	1	-2/+2
\| \|\ \ \| \| \|/
\| \| *	Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)	David Brown	2010-10-13	1	-2/+2
* \| \|	am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbread	Wink Saville	2010-10-13	3	-13/+27
\|\ \ \ \| \|/ /
\| * \|	am a3100314: Merge "Remove some PII." into gingerbread	Wink Saville	2010-10-12	3	-13/+27
\| \|\ \ \| \| \|/
\| \| *	Remove some PII.	Wink Saville	2010-10-12	3	-13/+27
* \| \|	am 7a26ebdf: am 844a6b3c: Turn off additional debug.	John Wang	2010-10-13	1	-4/+4
\|\ \ \ \| \|/ /
\| * \|	am 844a6b3c: Turn off additional debug.	John Wang	2010-10-12	1	-4/+4
\| \|\ \ \| \| \|/
\| \| *	Turn off additional debug.	John Wang	2010-10-12	1	-4/+4
* \| \|	am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.	Hung-ying Tyan	2010-10-13	2	-6/+17
\|\ \ \ \| \|/ /
\| * \|	am f5201ab7: Keep original phone number in SipConnection.	Hung-ying Tyan	2010-10-11	2	-6/+17
\| \|\ \ \| \| \|/
\| \| *	Keep original phone number in SipConnection.	Hung-ying Tyan	2010-10-12	2	-6/+17
\| * \|	am 15f7ff3c: Merge "Fix compile errors in telephony tests"	Jean-Baptiste Queru	2010-10-11	2	-2/+2
\| \|\ \
\| \| * \	Merge "Fix compile errors in telephony tests"	Jean-Baptiste Queru	2010-10-11	2	-2/+2
\| \| \|\ \
\| \| \| * \|	Fix compile errors in telephony tests	Mark Piper	2010-08-06	2	-2/+2
* \| \| \| \|	resolved conflicts for merge of d4e3bf4d to master	Xia Wang	2010-10-12	2	-3/+192
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am c8511af0: Merge "Add mock ril control commands and tests" into gingerbread	Xia Wang	2010-10-11	2	-9/+178
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge "Add mock ril control commands and tests" into gingerbread	Xia Wang	2010-10-11	2	-9/+178
\| \| \|\ \ \
\| \| \| * \| \|	Add mock ril control commands and tests	Xia Wang	2010-10-10	2	-9/+178
* \| \| \| \| \|	am 5bf55c80: am 0e430ccc: Merge "Telephony: Fix radio state printing"	Jean-Baptiste Queru	2010-10-11	1	-16/+21
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 0e430ccc: Merge "Telephony: Fix radio state printing"	Jean-Baptiste Queru	2010-10-10	1	-16/+21
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge "Telephony: Fix radio state printing"	Jean-Baptiste Queru	2010-10-10	1	-16/+21
\| \| \|\ \ \ \