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

31465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Gloria Wang
dc87971f72 am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin 
* commit '7ea3c7f5a31dcc40d3b5042e3eb724916b66384e':
  - Some change on the DrmManager in order to support feature request 4082089.     In DrmManager, we currently lock both processDrmInfo() and onInfo() which is     ok for now since processDrmInfo() is async call, and it will return without     waiting for onInfo() call. However, if we send an event in processDrmInfo(),     we will got deadlock here because we need to invoke onInf() which will wait     for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock.
 2011-03-14 09:35:08 -07:00
Gloria Wang
50e4bf4895 Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1 2011-03-14 09:32:58 -07:00
Mike Lockwood
817b0a5efd am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 
* commit 'e976ff4a2203e5a01c9a1c1a018ba9e5ab7777f7':
  Add a dialog to ask user to start an application for a USB device or accessory
 2011-03-14 06:55:24 -07:00
Mike Lockwood
52cf8ff162 am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 
* commit 'dec0b755fff1bf87aafd397ef0dd864f54c587cf':
  MTP host: Fix problems reading large data packets
 2011-03-14 06:55:21 -07:00
Mike Lockwood
6f1547b9a4 Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 2011-03-14 04:02:50 -07:00
Mike Lockwood
0b72b4ebec Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 2011-03-14 04:02:29 -07:00
Christopher Tate
e9459dcb59 am 767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 
* commit '767d7a03733c867da7cad466a9303208eb51699f':
  Add a test app: quota exceeded doing a backup
 2011-03-11 18:24:49 -08:00
Christopher Tate
96b60ba644 Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 2011-03-11 18:22:37 -08:00
Dianne Hackborn
108fa5a9c7 am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 
* commit '9ff6483843bfa23751b1acf32b169fca9ad97f7f':
  Fix issues #4087362 and #4087356
 2011-03-11 18:04:04 -08:00
Dianne Hackborn
884c4106e2 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 2011-03-11 18:01:47 -08:00
Mike Lockwood
ec7c7f0411 am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 
* commit '9fffd9a8bb73e9b225878686862d49b27e98c659':
  USB: minor cleanup work
 2011-03-11 17:54:23 -08:00
Mike Lockwood
103a217104 Merge "USB: minor cleanup work" into honeycomb-mr1 2011-03-11 17:52:36 -08:00
Adam Powell
938125dac3 am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 
* commit '87584f51a865cfe8ef19c2b24e858a63cb3e475c':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
 2011-03-11 16:41:50 -08:00
Adam Powell
ba23ee2d57 Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 2011-03-11 16:39:42 -08:00
Glenn Kasten
2e3c2f0453 am 76470914: Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 
* commit '7647091436c45af2d82f12c9ea9ec77fa309b49b':
  Bug 3515073 Add ANativeWindow_fromSurfaceTexture
 2011-03-11 16:34:30 -08:00
Glenn Kasten
9f669c5391 Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 2011-03-11 16:31:55 -08:00
Kenny Root
a05c7c2920 am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-11 15:45:34 -08:00
Nicolas Roard
71df979198 am f0230cca: Merge "HTML5 Video improvements" into honeycomb-mr1 
* commit 'f0230cca194c840684bab959856c56725fc40b87':
  HTML5 Video improvements
 2011-03-11 15:11:14 -08:00
Nicolas Roard
52d2b87932 Merge "HTML5 Video improvements" into honeycomb-mr1 2011-03-11 14:35:32 -08:00
James Dong
0f1351ed69 am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit '68f66b945e7a69549689becd2e656d9056f1e7f5':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-11 14:31:37 -08:00
Kenny Root
eb9d908d96 Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 2011-03-11 14:22:22 -08:00
Robert Greenwalt
d395d372c1 Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-11 14:16:18 -08:00
Robert Greenwalt
fce2201da0 resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp 
Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0
 2011-03-11 14:05:14 -08:00
James Dong
f3f7d3504e Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 2011-03-11 13:38:02 -08:00
Mike Lockwood
367798e84a am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 
* commit '14c875eac750ca096de439225b1a028b1facc58e':
  Clear default for USB device/accessory when new matching app is installed
 2011-03-11 13:26:14 -08:00
Mike Lockwood
fd30a36d99 Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 2011-03-11 13:24:01 -08:00
Joe Malin
09eaf6019c am 761b8440: am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb 
* commit '761b84409135641ec27bb828dbd8a1d04a7252fe':
  DOC CHANGE: Fix 4084450 monkeyrunner_concepts
 2011-03-11 13:12:37 -08:00