Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
62388cfc1fb2483eb6582ccb8e36d47f16bf01fa
frameworks_base/telephony/java
History
Simon Wilson 62388cfc1f resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp 
Conflicts:
	telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
2011-05-26 12:53:15 -07:00
..
android/telephony
am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE
2011-05-13 09:20:08 -07:00
com/android/internal/telephony
resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp
2011-05-26 12:53:15 -07:00