OSDN Git Service

android-x86/frameworks-native.git
12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 18:02:15 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release

Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 16 Feb 2012 17:40:11 +0000 (09:40 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:29:07 +0000 (09:29 -0800)]
am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1

* commit 'e8e0527aa699c7db999b659b044d16cea6c67901':
  Update WiMAX notification icons Bug: 5724605

12 years agoMerge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:27:05 +0000 (09:27 -0800)]
Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1

12 years agoam c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into...
Justin Ho [Thu, 16 Feb 2012 17:24:42 +0000 (09:24 -0800)]
am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1

* commit 'c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
  Part of fixing issue #6006757: Keyboard dismissal lags

12 years agoMerge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:23:01 +0000 (09:23 -0800)]
Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1

12 years agoam 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers documen...
Scott Main [Thu, 16 Feb 2012 01:34:09 +0000 (17:34 -0800)]
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.

12 years agoMerge "docs: move USB installation info into the OEM USB Drivers document because...
Scott Main [Thu, 16 Feb 2012 01:31:54 +0000 (17:31 -0800)]
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

12 years agoam 26703326: docs: Google+ badge now sizes properly; remove reposition hack
Scott Main [Wed, 15 Feb 2012 21:26:51 +0000 (13:26 -0800)]
am 26703326: docs: Google+ badge now sizes properly; remove reposition hack

* commit '26703326784a6de45830236bd0a97345f93448d4':
  docs: Google+ badge now sizes properly; remove reposition hack

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 14 Feb 2012 22:15:44 +0000 (14:15 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:41:47 +0000 (13:41 -0800)]
am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1

* commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd':
  Stop using shared DUN APN when tethering stops.

12 years agoam fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:39:25 +0000 (13:39 -0800)]
am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1

* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
  Add a config to set Dun capabilities.

12 years agoMerge "Stop using shared DUN APN when tethering stops." into ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:38:15 +0000 (13:38 -0800)]
Merge "Stop using shared DUN APN when tethering stops." into ics-mr1

12 years agoMerge "Add a config to set Dun capabilities." into ics-mr1
Robert Greenwalt [Tue, 14 Feb 2012 21:37:44 +0000 (13:37 -0800)]
Merge "Add a config to set Dun capabilities." into ics-mr1

12 years agoam c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605...
Justin Ho [Tue, 14 Feb 2012 21:31:00 +0000 (13:31 -0800)]
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

12 years agoMerge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
Justin Ho [Tue, 14 Feb 2012 21:29:08 +0000 (13:29 -0800)]
Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1

12 years agoam 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
Joe Fernandez [Tue, 14 Feb 2012 20:37:18 +0000 (12:37 -0800)]
am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1

* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
  docs: Android NDK r7b Release Notes

12 years agoam ffc89899: Merge "Don\'t pulse LED on new notification unless notification has...
Mike Lockwood [Tue, 14 Feb 2012 20:37:16 +0000 (12:37 -0800)]
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

12 years agoam 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
John Wang [Tue, 14 Feb 2012 20:37:14 +0000 (12:37 -0800)]
am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1

* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.

12 years agoMerge "docs: Android NDK r7b Release Notes" into ics-mr1
Joe Fernandez [Tue, 14 Feb 2012 20:05:25 +0000 (12:05 -0800)]
Merge "docs: Android NDK r7b Release Notes" into ics-mr1

12 years agoMerge "Don't pulse LED on new notification unless notification has LED flag set"...
Mike Lockwood [Tue, 14 Feb 2012 19:30:05 +0000 (11:30 -0800)]
Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1

12 years agoMerge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
John Wang [Tue, 14 Feb 2012 18:09:26 +0000 (10:09 -0800)]
Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1

12 years agoam eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"
Jean-Baptiste Queru [Tue, 14 Feb 2012 03:58:09 +0000 (19:58 -0800)]
am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"

* commit 'eaf2617fc20dd6484722edc9df41faf6e91d73cc':
  Fix incorrect prototype for JNI call

12 years agoam 472512f6: Merge "Fix incorrect prototype for JNI call"
Jean-Baptiste Queru [Tue, 14 Feb 2012 03:55:52 +0000 (19:55 -0800)]
am 472512f6: Merge "Fix incorrect prototype for JNI call"

* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
  Fix incorrect prototype for JNI call

12 years agoMerge "Fix incorrect prototype for JNI call"
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:32:32 +0000 (14:32 -0800)]
Merge "Fix incorrect prototype for JNI call"

12 years agoam 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:43:07 +0000 (13:43 -0800)]
am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1

* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests

12 years agoMerge "extending timeout to stabilize tests" into ics-mr1
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:41:37 +0000 (13:41 -0800)]
Merge "extending timeout to stabilize tests" into ics-mr1

12 years agoam 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode proper...
Wink Saville [Fri, 10 Feb 2012 23:14:40 +0000 (15:14 -0800)]
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

12 years agoMerge "Add OEM specific USB mode enumeration based on ro.bootmode property" into...
Wink Saville [Fri, 10 Feb 2012 23:12:19 +0000 (15:12 -0800)]
Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

12 years agoam 650462bb: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:11:45 +0000 (13:11 -0800)]
am 650462bb: Import revised translations.  DO NOT MERGE

* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE

12 years agoam 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 10 Feb 2012 18:09:42 +0000 (10:09 -0800)]
am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1

12 years agoam d9c8bbd5: docs: fix xss issue bug 5125642
Scott Main [Fri, 10 Feb 2012 00:01:51 +0000 (16:01 -0800)]
am d9c8bbd5: docs: fix xss issue bug 5125642

* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642

12 years agoam 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696...
Joe Fernandez [Thu, 9 Feb 2012 21:46:41 +0000 (13:46 -0800)]
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)

12 years agoMerge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android...
Joe Fernandez [Thu, 9 Feb 2012 21:45:01 +0000 (13:45 -0800)]
Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

12 years agoam 52bfc243: docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:48:08 +0000 (12:48 -0800)]
am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker

12 years agoam 09ff04d7: docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:48:03 +0000 (21:48 -0800)]
am 09ff04d7: docs: fix typo in menu TOC

* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
  docs: fix typo in menu TOC

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Tue, 7 Feb 2012 18:09:07 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release

Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f

12 years agoam 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
John Wang [Tue, 7 Feb 2012 01:02:30 +0000 (17:02 -0800)]
am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1

* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
  Don't use SNR in the invalid check.

12 years agoMerge "Don't use SNR in the invalid check." into ics-mr1
John Wang [Tue, 7 Feb 2012 01:00:49 +0000 (17:00 -0800)]
Merge "Don't use SNR in the invalid check." into ics-mr1

12 years agoam 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do...
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:56 +0000 (16:42 -0800)]
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.

12 years agoam a9d9fa72: Merge "docs: switch from caps to initial-case for device button names...
Scott Main [Mon, 6 Feb 2012 22:12:03 +0000 (14:12 -0800)]
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

12 years agoMerge "docs: switch from caps to initial-case for device button names" into ics-mr1
Scott Main [Mon, 6 Feb 2012 22:10:16 +0000 (14:10 -0800)]
Merge "docs: switch from caps to initial-case for device button names" into ics-mr1

12 years agoam 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the...
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:09:36 +0000 (14:09 -0800)]
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.

12 years agoam a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:07:31 +0000 (14:07 -0800)]
am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."

* commit 'a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
  Skia API changes as a result of an update to the Skia library.

12 years agoMerge "Skia API changes as a result of an update to the Skia library."
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:01:05 +0000 (14:01 -0800)]
Merge "Skia API changes as a result of an update to the Skia library."

12 years agoam 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1
Scott Main [Mon, 6 Feb 2012 21:05:04 +0000 (13:05 -0800)]
am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1

* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
  docs: add Sony USB VID issue 5967572

12 years agoMerge "docs: add Sony USB VID issue 5967572" into ics-mr1
Scott Main [Mon, 6 Feb 2012 21:03:16 +0000 (13:03 -0800)]
Merge "docs: add Sony USB VID issue 5967572" into ics-mr1

12 years agoam f8aea993: Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:56 +0000 (11:41 -0800)]
am f8aea993: Make aapt ignore tools-related data.

* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
  Make aapt ignore tools-related data.

12 years agoam 633de7ba: docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:12:33 +0000 (15:12 -0800)]
am 633de7ba: docs: fix meta description tag for homepage

* commit '633de7bab9397c4f7591c5514d903305254451b2':
  docs: fix meta description tag for homepage

12 years agoam 6aaa27fb: docs: fix broken link
Scott Main [Wed, 1 Feb 2012 23:00:49 +0000 (15:00 -0800)]
am 6aaa27fb: docs: fix broken link

* commit '6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
  docs: fix broken link

12 years agoam 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
Scott Main [Wed, 1 Feb 2012 19:56:23 +0000 (11:56 -0800)]
am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1

* commit '6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
  docs: fix action bar style example

12 years agoMerge "docs: fix action bar style example" into ics-mr1
Scott Main [Wed, 1 Feb 2012 19:54:57 +0000 (11:54 -0800)]
Merge "docs: fix action bar style example" into ics-mr1

12 years agoam f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
Scott Main [Wed, 1 Feb 2012 19:45:51 +0000 (11:45 -0800)]
am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1

* commit 'f47f6791f897b436530557dea3a57a2ca969afe6':
  docs: dashboard update for feb 1

12 years agoam 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:45:49 +0000 (11:45 -0800)]
am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions

* commit '5e0959393426371dadef2c7905d5c915a1ac2dd4':
  docs: update menu guide with CAB and popup menu, plus many other revisions

12 years agoMerge "docs: dashboard update for feb 1" into ics-mr1
Scott Main [Wed, 1 Feb 2012 19:43:48 +0000 (11:43 -0800)]
Merge "docs: dashboard update for feb 1" into ics-mr1

12 years agoam ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
Xia Wang [Wed, 1 Feb 2012 18:54:30 +0000 (10:54 -0800)]
am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1

* commit 'ccc11c4d3c8357a402b84c546e7b2f889729358c':
  Fix a typo in image processing test

12 years agoMerge "Fix a typo in image processing test" into ics-mr1
Xia Wang [Wed, 1 Feb 2012 18:51:43 +0000 (10:51 -0800)]
Merge "Fix a typo in image processing test" into ics-mr1

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 16:42:59 +0000 (08:42 -0800)]
Reconcile with ics-mr1-release

Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f

12 years agoam 0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully...
Scott Main [Wed, 1 Feb 2012 00:10:38 +0000 (16:10 -0800)]
am 0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a form

* commit '0b2701b7344fb7b7b6f9a1c1c99c8ede81b49d2d':
  docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.

12 years agoMerge "docs: change that stated as a few doc fixes and turned into fully documenting...
Scott Main [Wed, 1 Feb 2012 00:08:09 +0000 (16:08 -0800)]
Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug." into ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 31 Jan 2012 23:42:17 +0000 (15:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
Justin Ho [Tue, 31 Jan 2012 22:02:44 +0000 (14:02 -0800)]
am 792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1

* commit '792d83c5087a7a6dec4e64f59f5b78d1041c9585':
  Use LTE SNR and RSRP to set signal level bar.

12 years agoMerge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
Justin Ho [Tue, 31 Jan 2012 22:00:55 +0000 (14:00 -0800)]
Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1

12 years agoam 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue...
Scott Main [Tue, 31 Jan 2012 16:41:03 +0000 (08:41 -0800)]
am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1

* commit '34260ad79ede2ed35cc9859095b778f194b9650b':
  docs: fix locale name; South Africa is local en_ZA external issue 23133

12 years agoam 8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:41:01 +0000 (08:41 -0800)]
am 8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1

* commit '8bfeb10f98125706d8bb7afa1067ca563e741540':
  docs: fix typo in market doc external issue 22650

12 years agoam 4b2eb9a5: Merge "docs: fix typos and clarify some grammar in summary external...
Scott Main [Tue, 31 Jan 2012 16:40:59 +0000 (08:40 -0800)]
am 4b2eb9a5: Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1

* commit '4b2eb9a50bbead0b756944ebffd01c89916896ad':
  docs: fix typos and clarify some grammar in summary external issue 21548

12 years agoMerge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into...
Scott Main [Tue, 31 Jan 2012 16:39:36 +0000 (08:39 -0800)]
Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1

12 years agoMerge "docs: fix typo in market doc external issue 22650" into ics-mr1
Scott Main [Tue, 31 Jan 2012 16:39:03 +0000 (08:39 -0800)]
Merge "docs: fix typo in market doc external issue 22650" into ics-mr1

12 years agoam b86cba15: docs: fix typo in eclipse doc external issue 21475
Scott Main [Tue, 31 Jan 2012 16:38:49 +0000 (08:38 -0800)]
am b86cba15: docs: fix typo in eclipse doc external issue 21475

* commit 'b86cba156c78740793d94444e01d17ef21cb53cc':
  docs: fix typo in eclipse doc external issue 21475

12 years agoMerge "docs: fix typos and clarify some grammar in summary external issue 21548"...
Scott Main [Tue, 31 Jan 2012 16:37:59 +0000 (08:37 -0800)]
Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 31 Jan 2012 07:33:37 +0000 (23:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings...
Scott Main [Tue, 31 Jan 2012 00:15:29 +0000 (16:15 -0800)]
am b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1

* commit 'b2d37b39a1bb48d9f9c5b45255c5df769b85d6ae':
  docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results

12 years agoMerge "docs: update sidenav to use <span> instead of <h2> for headings, under suspici...
Scott Main [Tue, 31 Jan 2012 00:13:28 +0000 (16:13 -0800)]
Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1

12 years agoam 6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget...
Scott Main [Mon, 30 Jan 2012 23:14:53 +0000 (15:14 -0800)]
am 6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit

* commit '6507df8b78d80403d66d321748ad47290a611e3f':
  docs: add meta descriptions for home and sdk also revise the G+ widget to make fit

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)]
Reconcile with ics-mr1-release

Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 30 Jan 2012 21:23:32 +0000 (13:23 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam e22f4748: Merge "Update documentation to reflect the old approach not working...
Dianne Hackborn [Mon, 30 Jan 2012 20:54:02 +0000 (12:54 -0800)]
am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1

* commit 'e22f4748565915948c8af2961ac74fe81a417e3b':
  Update documentation to reflect the old approach not working.

12 years agoMerge "Update documentation to reflect the old approach not working." into ics-mr1
Dianne Hackborn [Mon, 30 Jan 2012 20:52:11 +0000 (12:52 -0800)]
Merge "Update documentation to reflect the old approach not working." into ics-mr1

12 years agoam b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
John Wang [Mon, 30 Jan 2012 19:23:24 +0000 (11:23 -0800)]
am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1

* commit 'b069833e63f711a6b140385003d67b3ff68fe66b':
  Adjust the LTE signal bar mapping.

12 years agoMerge "Adjust the LTE signal bar mapping." into ics-mr1
John Wang [Mon, 30 Jan 2012 19:20:35 +0000 (11:20 -0800)]
Merge "Adjust the LTE signal bar mapping." into ics-mr1

12 years agoam 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
Scott Main [Mon, 30 Jan 2012 18:05:59 +0000 (10:05 -0800)]
am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1

* commit '73790a53b580b8ec8eff88e25a19b5fcfa33392a':
  docs: add G+ page announcement to homepage

12 years agoMerge "docs: add G+ page announcement to homepage" into ics-mr1
Scott Main [Mon, 30 Jan 2012 18:03:21 +0000 (10:03 -0800)]
Merge "docs: add G+ page announcement to homepage" into ics-mr1

12 years agoam dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:58:03 +0000 (13:58 -0800)]
am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"

* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
  Wi-Fi: Handle disconnect in middle of DHCP operation

12 years agoam 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:55:56 +0000 (13:55 -0800)]
am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"

* commit '9781870491f4f33403f8d518879a88c20180d7cb':
  Wi-Fi: Handle disconnect in middle of DHCP operation

12 years agoMerge "Wi-Fi: Handle disconnect in middle of DHCP operation"
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:36:48 +0000 (13:36 -0800)]
Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 27 Jan 2012 02:32:07 +0000 (18:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download...
Roman Nurik [Fri, 27 Jan 2012 00:35:06 +0000 (16:35 -0800)]
am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1

* commit '639b25ea289481da6cfd4229649b51ffc6ce3406':
  docs: add NOTICE to action bar icon pack and sprinkle download links

12 years agoMerge "docs: add NOTICE to action bar icon pack and sprinkle download links" into...
Roman Nurik [Fri, 27 Jan 2012 00:32:56 +0000 (16:32 -0800)]
Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1

12 years agoam 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Andro...
Roman Nurik [Thu, 26 Jan 2012 23:35:46 +0000 (15:35 -0800)]
am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1

* commit '00b3ceb48b5e23daa8101db6080bee46d6518f43':
  docs: Update designing-navigation training class to link to Android Design

12 years agoMerge "docs: Update designing-navigation training class to link to Android Design...
Roman Nurik [Thu, 26 Jan 2012 23:33:57 +0000 (15:33 -0800)]
Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1

12 years agoam 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into...
Daniel Sandler [Thu, 26 Jan 2012 21:04:17 +0000 (13:04 -0800)]
am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1

* commit '5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
  Suppress mobile-out-of-service label if wifi connected.

12 years agoMerge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
Daniel Sandler [Thu, 26 Jan 2012 21:02:32 +0000 (13:02 -0800)]
Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1

12 years agoam 6c055bbd: docs: add action bar icons ZIP
Scott Main [Thu, 26 Jan 2012 19:44:58 +0000 (11:44 -0800)]
am 6c055bbd: docs: add action bar icons ZIP

* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
  docs: add action bar icons ZIP

12 years agoam 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
Scott Main [Thu, 26 Jan 2012 02:00:42 +0000 (18:00 -0800)]
am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1

* commit '9ac4dd828065410efbb380992d996c7e93daf437':
  docs: remove the 1.0 icon template pack

12 years agoMerge "docs: remove the 1.0 icon template pack" into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:58:54 +0000 (17:58 -0800)]
Merge "docs: remove the 1.0 icon template pack" into ics-mr1

12 years agoam f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into...
Scott Main [Thu, 26 Jan 2012 01:52:08 +0000 (17:52 -0800)]
am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1

* commit 'f466db14ec32fbaf08a868df40f7685a7e7df3db':
  docs: remove ADL presentation PDFs to conserve site space

12 years agoMerge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:50:20 +0000 (17:50 -0800)]
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1

12 years agoam 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:30:13 +0000 (17:30 -0800)]
am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics

* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
  DOC CHANGE: New Content Provider topics

12 years agoam a2a46f62: DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:27:46 +0000 (17:27 -0800)]
am a2a46f62: DOC CHANGE: New Content Provider topics

* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
  DOC CHANGE: New Content Provider topics