git.osdn.net Git - android-x86/frameworks-base.git/commit

(root) / android-x86 / frameworks-base.git / commit

author	Hung-ying Tyan <tyanh@google.com>
	Sat, 2 Oct 2010 17:17:29 +0000 (01:17 +0800)
committer	Hung-ying Tyan <tyanh@google.com>
	Sat, 2 Oct 2010 17:18:34 +0000 (01:18 +0800)
commit	aeba1bc0c333f145469fc17a10c0bbcebd6dc30b
tree	6e8f07cd392c03ca63d145fbe79539143b92ac34	tree \| snapshot
parent	bdf11be97bd732e8891ae19342c937da6e659afa	commit \| diff

Revert "Revert "resolved conflicts for merge of 8788d140 to master""

This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.

Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a

frameworks/base

RSS Atom

About OSDN

Site Announce
About OSDN
Privacy
Terms of Use
Advertise

Find Software

Search
Find by Categories
Download Ranking
Project Ranking

Develop Software

Create Project/Chamber
What's new
Recently Registered Project
Chambers Map
API

Help

Help Docs
Contact Us
Report Abuse/spam

telephony/java/com/android/internal/telephony/SipPhoneNotifier.java	[deleted file]	blob \| history
telephony/java/com/android/internal/telephony/sip/CallFailCause.java	[deleted file]	blob \| history
telephony/java/com/android/internal/telephony/sip/CallProxy.java	[deleted file]	blob \| history
telephony/java/com/android/internal/telephony/sip/SipCallBase.java		diff \| blob \| history
telephony/java/com/android/internal/telephony/sip/SipCommandInterface.java		diff \| blob \| history
telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java		diff \| blob \| history
telephony/java/com/android/internal/telephony/sip/SipPhone.java		diff \| blob \| history
telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java		diff \| blob \| history