Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |\ \ \ | |||||
| | | * | | | 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 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)" | Jean-Baptiste Queru | 2010-10-08 | 1 | -1/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | NullPointerException at handleMessage(GSMPhone.java) | Babis Triantafyllou | 2010-10-08 | 1 | -1/+2 |
| * | | | | am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" i... | Xia Wang | 2010-10-07 | 6 | -0/+486 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread | Xia Wang | 2010-10-07 | 6 | -0/+486 |
| | |\ \ \ | |||||
| | | * | | | Port mock ril controller and tests to GB. DO NOT MERGE | Xia Wang | 2010-10-07 | 6 | -0/+486 |
* | | | | | | 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 |
| | | | |_|/ | | | |/| | |