ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
41,817 Commits 2 Branches 0 Tags 54 MiB
61cb633f43
Commit Graph

41817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7442aa2c4c Reconcile with ics-mr1-release 
Change-Id: I0126d92680a2624881870d7c835b3abd02cd6bab
 2012-02-17 08:09:34 -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
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
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
The Android Open Source Project
874c7db891 Reconcile with ics-mr1-release 
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
 2012-02-16 10:02:16 -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
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
1e1a5d7820 Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 2012-02-16 09:27:05 -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
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
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
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
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
Robert Greenwalt
abc7387e26 am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1 
* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
  Add a config to set Dun capabilities.
 2012-02-14 13:39:25 -08:00
Robert Greenwalt
34297ab3a2 Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 2012-02-14 13:38:15 -08:00
Robert Greenwalt
b34f2b22a3 Merge "Add a config to set Dun capabilities." into ics-mr1 2012-02-14 13:37:44 -08:00
Justin Ho
3386c8d680 am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
  Update 4G WiMAX assets for notification area as well Bug: 5724605
 2012-02-14 13:31:00 -08:00
Justin Ho
cfcb3a71aa Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 2012-02-14 13:29:08 -08:00
Joe Fernandez
e8c0c352bc am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
  docs: Android NDK r7b Release Notes
 2012-02-14 12:37:18 -08:00
Mike Lockwood
14936f136c am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1 
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
  Don't pulse LED on new notification unless notification has LED flag set
 2012-02-14 12:37:16 -08:00
John Wang
74786c5669 am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.
 2012-02-14 12:37:14 -08:00
Joe Fernandez
a9c71f71e6 Merge "docs: Android NDK r7b Release Notes" into ics-mr1 2012-02-14 12:05:25 -08:00
Mike Lockwood
51551a81ec Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1 2012-02-14 11:30:05 -08:00
John Wang
06ea772a19 Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 2012-02-14 10:09:26 -08:00
Jean-Baptiste Queru
18fa07a8ff am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call" 
* commit 'eaf2617fc20dd6484722edc9df41faf6e91d73cc':
  Fix incorrect prototype for JNI call
 2012-02-13 19:58:09 -08:00
Jean-Baptiste Queru
d6f9c36d84 am 472512f6: Merge "Fix incorrect prototype for JNI call" 
* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
  Fix incorrect prototype for JNI call
 2012-02-13 19:55:52 -08:00
Jean-Baptiste Queru
5e9fd0734f Merge "Fix incorrect prototype for JNI call" 2012-02-13 14:32:33 -08:00
Tsu Chiang Chuang
22e1920a70 am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests
 2012-02-13 13:43:07 -08:00
Tsu Chiang Chuang
0137d87be0 Merge "extending timeout to stabilize tests" into ics-mr1 2012-02-13 13:41:37 -08:00
Wink Saville
97c154c789 am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 
* commit '197fe26940022be75384f4038dd789f446d33122':
  Add OEM specific USB mode enumeration based on ro.bootmode property
 2012-02-10 15:14:40 -08:00
Wink Saville
23051433d2 Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 2012-02-10 15:12:19 -08:00
Eric Fischer
0686f4ec1b am 650462bb: Import revised translations. DO NOT MERGE 
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
 2012-02-10 13:11:45 -08:00
Justin Ho
f68eb20924 am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
  Import translations. DO NOT MERGE
 2012-02-10 10:09:42 -08:00
Justin Ho
b96058b1fa Merge "Import translations. DO NOT MERGE" into ics-mr1 2012-02-10 10:07:07 -08:00
Scott Main
e1eb4ca887 am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642
 2012-02-09 16:01:51 -08:00
Joe Fernandez
c4c313f8ca am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
 2012-02-09 13:46:41 -08:00
Joe Fernandez
8ec61aacd3 Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 2012-02-09 13:45:01 -08:00
Scott Main
fbf4f0cf02 am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:48:08 -08:00
Scott Main
6301e33ebb am 09ff04d7: docs: fix typo in menu TOC 
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
  docs: fix typo in menu TOC
 2012-02-07 21:48:03 -08:00
The Android Open Source Project
9fd89364ab Reconcile with ics-mr1-release 
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
 2012-02-07 10:09:08 -08:00
John Wang
5e7679927c am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
  Don't use SNR in the invalid check.
 2012-02-06 17:02:30 -08:00
John Wang
5245acf270 Merge "Don't use SNR in the invalid check." into ics-mr1 2012-02-06 17:00:49 -08:00
Xavier Ducrohet
d92740b76f am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:42:56 -08:00
Scott Main
f20d8ee17f am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:12:03 -08:00
Scott Main
3a00a8ad29 Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 2012-02-06 14:10:16 -08:00
Jean-Baptiste Queru
eb7e2d29de am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit '52da99fac85d1e16a3c95bdd9c039801e920e6d1':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:09:36 -08:00