ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
31,725 Commits 2 Branches 0 Tags 54 MiB
5205d7d509
Commit Graph

31725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
5205d7d509 am 5b79d003: (-s ours) am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE 
* commit '5b79d003e8324fef5c0caf6a11e446896728e0e6':
  Do not merge: RIL: Merge Issue. LTE SIM additions.
 2011-03-14 13:47:23 -07:00
Wink Saville
5f88dce53d am c8da3ddf: (-s ours) am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE 
* commit 'c8da3ddf3df453f57773d5f0b1bd1be68760d611':
  Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
 2011-03-14 13:47:20 -07:00
Wink Saville
ab18472b16 am 6207b8ca: (-s ours) am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE 
* commit '6207b8ca2df1c0addd27f3908d3d2f65e0e3851b':
  Do not merge: LTE: Fix SST for CDMALTEPhone.
 2011-03-14 13:47:18 -07:00
Wink Saville
6a76fc3dc9 am e1a50077: (-s ours) am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE 
* commit 'e1a500777d2c7e2211e6a41f69e63d1b61ec97af':
  Do not merge: Clean up LTE code change
 2011-03-14 13:47:15 -07:00
Wink Saville
80e033e5d7 am d9ca063d: (-s ours) am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 
* commit 'd9ca063d92b2ff980fa0e0e14955f837fcf75946':
  Do not merge: Add some input checking to prevent problems
 2011-03-14 13:47:12 -07:00
Wink Saville
7fb6e14931 am d7945967: (-s ours) am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 
* commit 'd79459670576da8aafc831ac0872f550d4137164':
  Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
 2011-03-14 13:45:19 -07:00
Wink Saville
9460cac2ff am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE 
* commit '08d79acc462a395a6fb6d0b126eb4d97466962c7':
  Do not merge: RIL: Merge Issue. LTE SIM additions.
 2011-03-14 13:44:48 -07:00
Wink Saville
8ce508231f am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE 
* commit '7fbae1d23c99383d0dbaa1be35a41246934e3ce4':
  Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
 2011-03-14 13:44:45 -07:00
Wink Saville
536c9e41b1 am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE 
* commit '16b7f051f71e276f4dd45455e92c33a0894bab10':
  Do not merge: LTE: Fix SST for CDMALTEPhone.
 2011-03-14 13:44:43 -07:00
Wink Saville
ea1b0c6b66 am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE 
* commit '9e22c33c2b6ff5c9a45ebac88d048f6f61557e82':
  Do not merge: Clean up LTE code change
 2011-03-14 13:44:40 -07:00
Wink Saville
4deedeb0e7 am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 
* commit 'c3853f36645f2f4f4801d6465e82095cf38ea043':
  Do not merge: Add some input checking to prevent problems
 2011-03-14 13:44:37 -07:00
Gilles Debunne
e375b82688 am 7069f7c0: (-s ours) am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
* commit '7069f7c0e78bf01bf83a5c14025525b8604f16b9':
  Double tap on a word no longer opens context menu. DO NOT MERGE
 2011-03-14 13:43:30 -07:00
Wink Saville
35f9c49542 am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 
* commit 'c15cf6353ee1c1cae83039a19fb8d5e5c7d76804':
  Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
 2011-03-14 13:42:50 -07:00
Wink Saville
456b90a3a6 Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE 2011-03-14 13:42:49 -07:00
Wink Saville
fc2aa886fe Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE 2011-03-14 13:42:24 -07:00
Wink Saville
1ad816a48f Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE 2011-03-14 13:42:07 -07:00
Wink Saville
b979cc999b Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE 2011-03-14 13:41:42 -07:00
Wink Saville
34840b1c6e Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 2011-03-14 13:41:26 -07:00
Gilles Debunne
b66cc3d5fc am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
* commit '816dd3d443108b473965f97123eef7300f53615f':
  Double tap on a word no longer opens context menu. DO NOT MERGE
 2011-03-14 13:41:14 -07:00
Wink Saville
32abb2088b Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 2011-03-14 13:40:58 -07:00
Gilles Debunne
4feb59c624 resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
 2011-03-14 12:57:01 -07:00
Irfan Sheriff
937db0dfff am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 
* commit 'fb8971106e5ea105e176c995c1ff3b4fbe630710':
  Backup and restore IP and proxy settings
 2011-03-14 12:10:27 -07:00
Kenny Root
aca304bef4 am 76d41f57: am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '76d41f5796c73e499f05375d004b39dc9961820c':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-14 12:09:54 -07:00
Gilles Debunne
351bc62889 am f2f3627f: am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 
* commit 'f2f3627f658931e9e8162cc6d066e4cccd81bd10':
  Paste popup uses a disabled icon when there is nothing to paste.
 2011-03-14 12:06:59 -07:00
Eric Laurent
233f476f2c am 733cb79a: am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 
* commit '733cb79a27fa434a1f5548201c953131285b4e81':
  Partial fix for issue 3515250: video chat and SCO
 2011-03-14 12:06:54 -07:00
James Dong
3dda313a49 am ad707d8f: (-s ours) am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit 'ad707d8f9aaff9cd1a121cb769772c921d870117':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-14 12:05:48 -07:00
Ying Wang
805d0dae84 am 0bdf9f8c: am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread 
* commit '0bdf9f8c48be4b001de2bac65b655063ca0d58ec':
  Dist com.android.nfc_extras.jar.
 2011-03-14 12:05:44 -07:00
Robert Greenwalt
3a0babc10b am 179dd46e: (-s ours) am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 
* commit '179dd46e5de9dd61a9011708d262ca40012e9040':
  DO NOT MERGE Backport of I1f55df8a from master.
 2011-03-14 12:05:41 -07:00
Nick Pelly
50093af2a2 am a64e2ad4: resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
* commit 'a64e2ad4da3612586594a19489a2b5d44f3f23a0':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-14 12:04:51 -07:00
Mike Lockwood
7cdf08b29f am 2d24213f: am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 
* commit '2d24213fca55fece8ce4a69a53abcd45983b0443':
  MtpDevice: Handle zero length packets in readResponse()
 2011-03-14 12:04:27 -07:00
Gloria Wang
6604730786 Merge "resolved conflicts for merge of c761a80d to master" 2011-03-14 12:02:58 -07:00
Gloria Wang
ab40d8bc0c resolved conflicts for merge of c761a80d to master 
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
 2011-03-14 11:56:39 -07:00
Irfan Sheriff
00ff0ca922 am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 
* commit '9b1ea0bd2c9af64c424fa4fef327108cb376b74f':
  Backup and restore IP and proxy settings
 2011-03-14 11:56:03 -07:00
Irfan Sheriff
2de4863141 am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 
* commit 'e21110f8b1e4aa884f7a4e2164ae90dab8d5f3fa':
  Backup and restore IP and proxy settings
 2011-03-14 11:50:38 -07:00
Kenny Root
ea6193c275 am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '206c62ed34dc8a48fd6c907d95456226949f42dd':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-14 11:49:56 -07:00
Irfan Sheriff
bd9100b11b Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 2011-03-14 11:48:35 -07:00
James Dong
33b8a8afc3 Merge "Fix PV AAC decoder crash due to out-of-boundary array access." 2011-03-14 11:46:55 -07:00
Gilles Debunne
d567127f0a Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread 2011-03-14 11:30:17 -07:00
Gilles Debunne
5d8d0339b5 Merge "Removed empty block warnings in TextView" 2011-03-14 11:28:31 -07:00
Gilles Debunne
2fd4c6ba9b Merge "Wrong null check in TextView" 2011-03-14 11:28:20 -07:00
Gilles Debunne
5a45a3e528 am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 
* commit '8503af848657356411a9bb4cf15d798d4f15111b':
  Paste popup uses a disabled icon when there is nothing to paste.
 2011-03-14 11:27:54 -07:00
Gilles Debunne
4e29229f65 Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 2011-03-14 11:26:36 -07:00
Eric Laurent
2652f094f7 am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 
* commit '3cbfd10bbb869f763880060ebe01dd66da62bbc3':
  Partial fix for issue 3515250: video chat and SCO
 2011-03-14 11:23:56 -07:00
Eric Laurent
ee76b4c19d Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 2011-03-14 11:21:50 -07:00
James Dong
7964f5ba8c am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit '7d93b7574f741a9cd8872771faefa3c92bed6576':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-14 10:53:51 -07:00
Ying Wang
6e53d8e334 am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread 
* commit 'e5570255636b60ae2eb56d2f7adf270a8cc40843':
  Dist com.android.nfc_extras.jar.
 2011-03-14 10:53:44 -07:00
Robert Greenwalt
928595e7f0 am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 
* commit '2e7415564ad1d77537f9f3d5151ed480fcfc6ef9':
  DO NOT MERGE Backport of I1f55df8a from master.
 2011-03-14 10:53:38 -07:00
Nick Pelly
096b928fb8 resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
 2011-03-14 10:28:11 -07:00
Mike Lockwood
33dff53e30 am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 
* commit '3ec9d06f070db3a8899ad235736abd0ffaf6f578':
  MtpDevice: Handle zero length packets in readResponse()
 2011-03-14 09:44:15 -07:00
Mike Lockwood
bd7c76eb79 Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 2011-03-14 09:43:14 -07:00