frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	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 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
\| \| \|\ \
\| \| \| * \|	Telephony: Fix radio state printing	Alex Yakavenka	2010-09-28	1	-16/+21
\| \| * \| \|	Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"	Jean-Baptiste Queru	2010-10-10	1	-1/+0
\| \| \|\ \ \
\| \| \| * \| \|	Telephony: Remove unused mRuimFileHandler reference from CDMAPhone	Alex Yakavenka	2010-09-28	1	-1/+0
\| \| \| \|/ /
* \| \| \| \|	am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipP...	David Brown	2010-10-11	2	-47/+11
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am d07833f5: Don\'t manually create CallerInfo objects from SipPhone	David Brown	2010-10-10	2	-47/+11
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Don't manually create CallerInfo objects from SipPhone	David Brown	2010-10-10	2	-47/+11
* \| \| \| \|	am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbread	John Wang	2010-10-11	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am df512214: Merge "Fix startDtmf." into gingerbread	John Wang	2010-10-10	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Fix startDtmf.	John Wang	2010-10-10	1	-1/+1
* \| \| \| \|	am 965d5337: am 38f53488: Merge "NullPointerException at handleMessage(GSMPho...	Jean-Baptiste Queru	2010-10-10	1	-1/+2
\|\ \ \ \ \ \| \|/ / / /