OSDN Git Service
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
Justin Ho [Thu, 16 Feb 2012 17:27:05 +0000 (09:27 -0800)]
Merge "Update WiMAX notification icons Bug:
5724605" 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
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
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
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
Robert Greenwalt [Tue, 14 Feb 2012 21:37:44 +0000 (13:37 -0800)]
Merge "Add a config to set Dun capabilities." 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
Joe Fernandez [Tue, 14 Feb 2012 20:05:25 +0000 (12:05 -0800)]
Merge "docs: Android NDK r7b Release Notes" into ics-mr1
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
John Wang [Tue, 14 Feb 2012 18:09:26 +0000 (10:09 -0800)]
Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." 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
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
Justin Ho [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1
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
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
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
Scott Main [Mon, 6 Feb 2012 21:03:16 +0000 (13:03 -0800)]
Merge "docs: add Sony USB VID issue
5967572" 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
Scott Main [Wed, 1 Feb 2012 19:43:48 +0000 (11:43 -0800)]
Merge "docs: dashboard update for feb 1" 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
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
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
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
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
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
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
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
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
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
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
John Wang [Mon, 30 Jan 2012 19:20:35 +0000 (11:20 -0800)]
Merge "Adjust the LTE signal bar mapping." 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
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
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
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
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
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
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
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
The Android Automerger [Wed, 25 Jan 2012 20:08:57 +0000 (12:08 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Greenwalt [Wed, 25 Jan 2012 19:28:30 +0000 (11:28 -0800)]
Merge "Filter our v6 address from tethering dns." into ics-mr1
Roman Nurik [Wed, 25 Jan 2012 02:08:52 +0000 (18:08 -0800)]
Merge "docs: Android Design typo and grammar fixes" into ics-mr1
The Android Automerger [Tue, 24 Jan 2012 21:33:01 +0000 (13:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Daniel Sandler [Tue, 24 Jan 2012 20:54:48 +0000 (12:54 -0800)]
Merge "Stop showing "No internet connection" when there is one." into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:49:39 +0000 (11:49 -0800)]
Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
Eric Laurent [Tue, 24 Jan 2012 19:49:16 +0000 (11:49 -0800)]
Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
Robert Greenwalt [Tue, 24 Jan 2012 19:40:19 +0000 (11:40 -0800)]
Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:33:15 +0000 (11:33 -0800)]
Merge "Another attempt at issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Dianne Hackborn [Tue, 24 Jan 2012 19:33:06 +0000 (11:33 -0800)]
Merge "Fix issue #
5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
Daniel Sandler [Tue, 24 Jan 2012 19:32:31 +0000 (11:32 -0800)]
Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
Jim Miller [Mon, 23 Jan 2012 23:49:32 +0000 (15:49 -0800)]
Merge "Revert "Fix
5797764: Increase lock screen's thread priority"" into ics-mr1
Justin Ho [Mon, 23 Jan 2012 23:11:00 +0000 (15:11 -0800)]
Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
Bill Gruber [Mon, 23 Jan 2012 18:21:16 +0000 (10:21 -0800)]
Merge "DevDocs update: Publishing on Market" into ics-mr1
The Android Automerger [Sat, 21 Jan 2012 00:12:47 +0000 (16:12 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jim Miller [Fri, 20 Jan 2012 23:24:20 +0000 (15:24 -0800)]
Merge "Fix
5797764: Increase lock screen's thread priority" into ics-mr1
Justin Ho [Fri, 20 Jan 2012 22:48:51 +0000 (14:48 -0800)]
Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
Justin Ho [Fri, 20 Jan 2012 22:33:07 +0000 (14:33 -0800)]
Merge "New out-of-service RSSI." into ics-mr1
Dianne Hackborn [Fri, 20 Jan 2012 20:01:51 +0000 (12:01 -0800)]
Merge "Fix issue #
5823276 again: home repaints after full-screen app is exited" into ics-mr1
Daniel Sandler [Fri, 20 Jan 2012 19:28:44 +0000 (11:28 -0800)]
Merge "Always show appropriate mobile service label." into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:24:13 +0000 (11:24 -0800)]
Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
Jeff Brown [Fri, 20 Jan 2012 19:24:01 +0000 (11:24 -0800)]
Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
The Android Automerger [Fri, 20 Jan 2012 00:28:56 +0000 (16:28 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 19 Jan 2012 23:43:19 +0000 (15:43 -0800)]
Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
Robert Ly [Thu, 19 Jan 2012 21:25:07 +0000 (13:25 -0800)]
resolved conflicts for merge of
b078d942 to ics-mr1
Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
Robert Ly [Thu, 19 Jan 2012 18:41:28 +0000 (10:41 -0800)]
am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
9575a1ab5d033248284d59b2a2ae6eda80f79762':
docs: wifi direct
Robert Ly [Thu, 19 Jan 2012 18:38:51 +0000 (10:38 -0800)]
Merge "docs: wifi direct" into ics-mr0
The Android Automerger [Thu, 19 Jan 2012 05:17:55 +0000 (21:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jim Miller [Thu, 19 Jan 2012 00:44:52 +0000 (16:44 -0800)]
Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
Eric Laurent [Thu, 19 Jan 2012 00:05:31 +0000 (16:05 -0800)]
Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
Wink Saville [Thu, 19 Jan 2012 00:03:24 +0000 (16:03 -0800)]
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
Adam Powell [Wed, 18 Jan 2012 22:47:20 +0000 (14:47 -0800)]
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:18:11 +0000 (13:18 -0800)]
Merge "docs: adding rs api docs" into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:17:51 +0000 (13:17 -0800)]
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
Joe Fernandez [Wed, 18 Jan 2012 20:33:45 +0000 (12:33 -0800)]
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
Scott Main [Sat, 14 Jan 2012 02:23:40 +0000 (18:23 -0800)]
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
Scott Main [Sat, 14 Jan 2012 02:21:42 +0000 (18:21 -0800)]
Merge "docs: mention x86 as a native platform filter" into ics-mr1
Dianne Hackborn [Sat, 14 Jan 2012 00:36:05 +0000 (16:36 -0800)]
Merge "Update notification documentation to follow current guidelines." into ics-mr1
The Android Automerger [Sat, 14 Jan 2012 00:18:17 +0000 (16:18 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Kenny Root [Fri, 13 Jan 2012 21:11:02 +0000 (13:11 -0800)]
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
Dianne Hackborn [Fri, 13 Jan 2012 20:56:40 +0000 (12:56 -0800)]
Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Bart Sears [Fri, 13 Jan 2012 20:32:43 +0000 (12:32 -0800)]
Merge "Update to latest version of Roboto" into ics-mr1
Christopher Tate [Fri, 13 Jan 2012 19:49:20 +0000 (11:49 -0800)]
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
John Huang [Fri, 13 Jan 2012 19:37:15 +0000 (11:37 -0800)]
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
Robert Ly [Fri, 13 Jan 2012 18:13:14 +0000 (10:13 -0800)]
Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
Scott Main [Thu, 12 Jan 2012 23:44:53 +0000 (15:44 -0800)]
Merge "docs: make AD logo clickable on home page" into ics-mr1
Chia-chi Yeh [Thu, 12 Jan 2012 22:24:30 +0000 (14:24 -0800)]
Merge "VPN: silence VPN notifications." into ics-mr1
The Android Automerger [Thu, 12 Jan 2012 22:01:29 +0000 (14:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Roman Nurik [Thu, 12 Jan 2012 20:45:00 +0000 (12:45 -0800)]
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
Jim Miller [Thu, 12 Jan 2012 20:28:59 +0000 (12:28 -0800)]
Merge "Fix
5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
Daniel Sandler [Thu, 12 Jan 2012 19:38:39 +0000 (11:38 -0800)]
Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
Matthew Xie [Thu, 12 Jan 2012 19:24:06 +0000 (11:24 -0800)]
Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:22:24 +0000 (11:22 -0800)]
Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug:
5853519" into ics-mr1
Scott Main [Thu, 12 Jan 2012 19:19:08 +0000 (11:19 -0800)]
Merge "docs: further clarify the behavior of targetSdkVersion bug:
5854083" into ics-mr1
Robert Greenwalt [Thu, 12 Jan 2012 17:24:45 +0000 (09:24 -0800)]
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
Danielle Millett [Thu, 12 Jan 2012 15:28:24 +0000 (07:28 -0800)]
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
Brian Colonna [Thu, 12 Jan 2012 14:33:49 +0000 (06:33 -0800)]
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
Xia Wang [Thu, 12 Jan 2012 01:52:06 +0000 (17:52 -0800)]
Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#:
5737922" into ics-mr1
Xia Wang [Thu, 12 Jan 2012 01:51:48 +0000 (17:51 -0800)]
Merge "Get average value for image processing test bug#:
5566079" into ics-mr1
Katie McCormick [Thu, 12 Jan 2012 00:40:37 +0000 (16:40 -0800)]
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
OSDN Git Service
