summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Removing TextView predraw listeners sooner"Michael Jurka2011-03-140-0/+0
|\
* \ Merge "Use touch pad gestures to manipulate the pointer."Jeff Brown2011-03-144-2/+217
|\ \
| * | Use touch pad gestures to manipulate the pointer.Jeff Brown2011-03-144-2/+217
* | | am 956a9bd5: (-s ours) am e62dee25: Do not merge: Telephony: Rename lte_on_cd...Ramesh Sudini2011-03-140-0/+0
|\ \ \
| * \ \ am e62dee25: Do not merge: Telephony: Rename lte_on_cdma property.Ramesh Sudini2011-03-140-0/+0
| |\ \ \
* | \ \ \ am bfc281b4: (-s ours) am f5727615: Do not merge: Telephony: Corrections to L...Ramesh Sudini2011-03-140-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am f5727615: Do not merge: Telephony: Corrections to LTE and eHRPD constant v...Ramesh Sudini2011-03-140-0/+0
| |\ \ \ \ | | |/ / /
* | | | | am 5a9a853a: (-s ours) am f90c2609: Do not merge: Add outputting "on" or "off...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am f90c2609: Do not merge: Add outputting "on" or "off" setRadioPower.Wink Saville2011-03-140-0/+0
| |\ \ \ \ | | |/ / /
* | | | | am ea93d815: (-s ours) am c06c5c1a: Do not merge: Telephony: Fix config to re...Ramesh Sudini2011-03-140-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM co...Ramesh Sudini2011-03-140-0/+0
| |\ \ \ \ | | |/ / /
* | | | | am ebcdd0ab: (-s ours) am 124e2872: Do not merge: Have createAllDataConnectio...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 124e2872: Do not merge: Have createAllDataConnectionList create the RetryM...Wink Saville2011-03-140-0/+0
| |\ \ \ \ | | |/ / /
* | | | | am b4153830: (-s ours) am 321b730a: Do not merge: Remove mRetryMgr and direct...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection r...Wink Saville2011-03-140-0/+0
| |\ \ \ \ | | |/ / /
* | | | | am d3f4b40c: (-s ours) am d6398ad3: Merge "Do not merge: Fix 3G connectivity ...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am d6398ad3: Merge "Do not merge: Fix 3G connectivity bug 3513741." into hone...Wink Saville2011-03-140-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTEWink Saville2011-03-140-0/+0
| | |\ \ \
* | | \ \ \ am 5b79d003: (-s ours) am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LT...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into ...Wink Saville2011-03-140-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTEWink Saville2011-03-140-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | am c8da3ddf: (-s ours) am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and ...Wink Saville2011-03-140-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Ti...Wink Saville2011-03-140-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | am 6207b8ca: (-s ours) am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDM...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeyc...Wink Saville2011-03-140-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTEWink Saville2011-03-140-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | am e1a50077: (-s ours) am 9e22c33c: Merge "Do not merge: Clean up LTE code ch...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTEWink Saville2011-03-140-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Do not merge: Clean up LTE code change" into honeycomb-LTEWink Saville2011-03-140-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | am d9ca063d: (-s ours) am c3853f36: Merge "Do not merge: Add some input check...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c3853f36: Merge "Do not merge: Add some input checking to prevent problems...Wink Saville2011-03-140-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Do not merge: Add some input checking to prevent problems" into honeyc...Wink Saville2011-03-140-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | am d7945967: (-s ours) am c15cf635: Merge "Do not merge: Revert the revert of...Wink Saville2011-03-140-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telep...Wink Saville2011-03-140-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Do not merge: Revert the revert of "LTE Changes for Telephony includin...Wink Saville2011-03-140-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | am 7069f7c0: (-s ours) am 816dd3d4: (-s ours) resolved conflicts for merge of...Gilles Debunne2011-03-140-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbrea...Gilles Debunne2011-03-140-0/+0
| |\ \ \ \
| | * \ \ \ resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aospGilles Debunne2011-03-140-0/+0
| | |\ \ \ \
| | | * \ \ \ Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into ...Gilles Debunne2011-03-140-0/+0
| | | |\ \ \ \
* | | | \ \ \ \ am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy...Irfan Sheriff2011-03-140-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" in...Irfan Sheriff2011-03-140-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1Irfan Sheriff2011-03-140-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Backup and restore IP and proxy settings" into honeycomb-mr1Irfan Sheriff2011-03-140-0/+0
| | | |\ \ \ \ \ \
* | | | \ \ \ \ \ \ am 76d41f57: am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecod...Kenny Root2011-03-140-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"Kenny Root2011-03-140-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"Kenny Root2011-03-110-0/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"Kenny Root2011-03-110-0/+0
* | | | | | | | | | am f2f3627f: am 8503af84: Merge "Paste popup uses a disabled icon when there ...Gilles Debunne2011-03-140-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to...Gilles Debunne2011-03-140-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |