ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
42,035 Commits 2 Branches 0 Tags 54 MiB
754e9d92b7
Commit Graph

42035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
125c4b9a95 Merge "Return error code when composing PDU fails" 2012-02-17 11:36:52 -08:00
Jean-Baptiste Queru
651fdee192 Merge "Add support for bmp and wav content types in MMS" 2012-02-17 11:03:35 -08:00
The Android Open Source Project
05dddc0671 am f5f5d61c: Reconcile with ics-mr1-release 
* commit 'f5f5d61c611b6f2c699ba472972e0b5c33c82402':
 2012-02-17 10:46:48 -08:00
Jean-Baptiste Queru
0306188977 am 8a33803d: am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" 
* commit '8a33803df5477bb9bd20bfae8c7a7d0833f6d2a9':
  Increase PDU parts buffer size for performance reasons
 2012-02-17 10:18:49 -08:00
Jean-Baptiste Queru
61cb633f43 am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" 
* commit 'a1ee18f1413471813f36a1d05927f5513c8931f5':
  Increase PDU parts buffer size for performance reasons
 2012-02-17 10:13:05 -08:00
Jean-Baptiste Queru
3429dad456 Merge "Increase PDU parts buffer size for performance reasons" 2012-02-17 09:53:29 -08:00
The Android Open Source Project
c4a6e6758d Reconcile with ics-mr1-release 
Change-Id: I04e83e00da70672ba81716c43919c489e77b14c6
 2012-02-17 09:02:50 -08:00
The Android Open Source Project
a00c2411ab am c30fdda0: Reconcile with ics-mr1-release 
* commit 'c30fdda052e82ca7b014b9817945e465cca78c75':
 2012-02-17 08:13:35 -08:00
The Android Open Source Project
7442aa2c4c Reconcile with ics-mr1-release 
Change-Id: I0126d92680a2624881870d7c835b3abd02cd6bab
 2012-02-17 08:09:34 -08:00
Marc Blank
0a8aaafbe9 am d3ea7331: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit 'd3ea7331041a4e0b30acb4d86d14318c407df53b':
 2012-02-16 16:57:34 -08:00
Marc Blank
a33ce7701c am 970c74ac: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit '970c74acb16529b73c03d93469472c3c3ba6af35':
  Use ' for apostrophe in HTML encoding DO NOT MERGE
 2012-02-16 16:56:36 -08:00
Marc Blank
1eb99959e2 am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit '094bf51ec0911057263a27db4d79db4eface2d63':
  Use ' for apostrophe in HTML encoding DO NOT MERGE
 2012-02-16 16:54:41 -08:00
Marc Blank
c9968559f1 am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit '094bf51ec0911057263a27db4d79db4eface2d63':
  Use ' for apostrophe in HTML encoding DO NOT MERGE
 2012-02-16 16:54:23 -08:00
The Android Automerger
e2f93ba590 merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 16:26:06 -08:00
Dianne Hackborn
df6d764658 am 1db7eeac: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '1db7eeac74d1455991e1dc0f532b47276d0c679c':
 2012-02-16 14:46:41 -08:00
Dianne Hackborn
49535226c1 am 01810bbb: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '01810bbb67b7af741b0dde0d7ccdadb76a46ed63':
  Fix last change -- don't call startInputInner() with lock held.
 2012-02-16 14:45:57 -08:00
Dianne Hackborn
ed9604b365 am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
 2012-02-16 14:44:03 -08:00
Dianne Hackborn
8103a941ba am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held. 
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
 2012-02-16 14:43:43 -08:00
The Android Open Source Project
824cf8190e am e113e793: Reconcile with ics-mr1-release 
* commit 'e113e793b32ca4c7fe41de41c40a34c494b4c783':
 2012-02-16 10:13:52 -08:00
The Android Open Source Project
4b33f90eed Reconcile with ics-mr1-release 
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
 2012-02-16 10:10:14 -08:00
The Android Open Source Project
868bca3ce1 am 9777fb10: Reconcile with ics-mr1-release 
* commit '9777fb106f3705e2a9610c4f9020d7f68941d83c':
 2012-02-16 10:04:19 -08:00
The Android Open Source Project
874c7db891 Reconcile with ics-mr1-release 
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
 2012-02-16 10:02:16 -08:00
Justin Ho
83bb479797 am eefef982: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 
* commit 'eefef98226682a1a6f4458c955b611c69b11068e':
 2012-02-16 09:44:03 -08:00
Justin Ho
7e2cadbe11 am 727ba648: am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 
* commit '727ba648d66bbeeb003803afcb380cf91bcd9966':
 2012-02-16 09:43:57 -08:00
The Android Automerger
04b944d66f merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 09:40:11 -08:00
Justin Ho
8874123a41 am ac18f89c: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 
* commit 'ac18f89cf5ac8a2a63223c28139f6697d974e533':
  Update WiMAX notification icons Bug: 5724605
 2012-02-16 09:31:31 -08:00
Justin Ho
272b803811 am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 
* commit 'e8e0527aa699c7db999b659b044d16cea6c67901':
  Update WiMAX notification icons Bug: 5724605
 2012-02-16 09:29:07 -08:00
Justin Ho
db7eaa3358 am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 
* commit 'e8e0527aa699c7db999b659b044d16cea6c67901':
  Update WiMAX notification icons Bug: 5724605
 2012-02-16 09:28:12 -08:00
Justin Ho
663fb1e776 am cc1bd4bb: am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 
* commit 'cc1bd4bbbc7314ab7d3ba015c16ea78cbfd6459f':
  Part of fixing issue #6006757: Keyboard dismissal lags
 2012-02-16 09:27:16 -08:00
Justin Ho
1e1a5d7820 Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 2012-02-16 09:27:05 -08:00
Justin Ho
0520e2603e am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 
* commit 'c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
  Part of fixing issue #6006757: Keyboard dismissal lags
 2012-02-16 09:25:03 -08:00
Justin Ho
7dee7fb0db am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 
* commit 'c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
  Part of fixing issue #6006757: Keyboard dismissal lags
 2012-02-16 09:24:42 -08:00
Justin Ho
c7e551a13d Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 2012-02-16 09:23:01 -08:00
Scott Main
2e37dbadf7 am 9fc057aa: am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device set 
* commit '9fc057aab4f08e5a40de665549f48bece0c7bd63':
 2012-02-15 18:36:00 -08:00
Scott Main
e9c18a94e7 am 27790d98: am 26703326: docs: Google+ badge now sizes properly; remove reposition hack 
* commit '27790d98d7c1f1804fda431bea1004c0e385da7a':
 2012-02-15 18:35:56 -08:00
Robert Greenwalt
b84ab941af am 3fd0ed8d: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 
* commit '3fd0ed8d84e6901ddd50fbf0012496bda235e552':
 2012-02-15 18:35:41 -08:00
Robert Greenwalt
a55f071f3a am 84d8eed0: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1 
* commit '84d8eed0d27bae6e6a99a0e73ff71af80edae4d8':
 2012-02-15 18:35:39 -08:00
Justin Ho
0e540f47d7 am 8a3bf559: am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 
* commit '8a3bf55942f3a6c6a20bd8be03c142ef986600b5':
 2012-02-15 18:35:36 -08:00
Scott Main
8567e68c65 am 09af1ade: am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device set 
* commit '09af1aded6dacf35cf54597cd81a636337bd9c9c':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
 2012-02-15 17:36:54 -08:00
Scott Main
e8bea79a35 am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; 
* commit '2a1d19174e32bb6056086ec603948cd476a2ea67':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
 2012-02-15 17:34:09 -08:00
Scott Main
9030258fc6 am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; 
* commit '2a1d19174e32bb6056086ec603948cd476a2ea67':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
 2012-02-15 17:33:15 -08:00
Scott Main
b37165202a Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1 2012-02-15 17:31:54 -08:00
Scott Main
bb83b1dc70 am fc28fbd4: am 26703326: docs: Google+ badge now sizes properly; remove reposition hack 
* commit 'fc28fbd4e2ccac932f6a72370d4bf4f4d043d49d':
  docs: Google+ badge now sizes properly; remove reposition hack
 2012-02-15 13:29:54 -08:00
Scott Main
e1419aff61 am 26703326: docs: Google+ badge now sizes properly; remove reposition hack 
* commit '26703326784a6de45830236bd0a97345f93448d4':
  docs: Google+ badge now sizes properly; remove reposition hack
 2012-02-15 13:26:51 -08:00
Scott Main
0211a3dc3c am 26703326: docs: Google+ badge now sizes properly; remove reposition hack 
* commit '26703326784a6de45830236bd0a97345f93448d4':
  docs: Google+ badge now sizes properly; remove reposition hack
 2012-02-15 13:26:27 -08:00
Robert Greenwalt
3f4ae9ba33 am 7874efeb: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 
* commit '7874efeb138204230475720d0b97f2d199a21502':
  Stop using shared DUN APN when tethering stops.
 2012-02-14 16:25:11 -08:00
Robert Greenwalt
90ebe73f02 am e3776a47: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1 
* commit 'e3776a47dbebc8195edeac39f7f4ce3e08b59bec':
  Add a config to set Dun capabilities.
 2012-02-14 16:25:09 -08:00
Justin Ho
bef300dd83 am e6ccc94e: am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 
* commit 'e6ccc94ef9825360d8993553b30dcaa0f342c871':
  Update 4G WiMAX assets for notification area as well Bug: 5724605
 2012-02-14 16:25:08 -08:00
The Android Automerger
282ce65def merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:15:44 -08:00
Robert Greenwalt
fd8d6c3d5f am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 
* commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd':
  Stop using shared DUN APN when tethering stops.
 2012-02-14 13:41:47 -08:00