git.osdn.net Git - android-x86/frameworks-native.git/log

Jean-Baptiste Queru [Wed, 2 Feb 2011 17:48:52 +0000 (09:48 -0800)]

am 155b0ee0: Merge from open-source gingerbread

* commit '155b0ee0498cf863091f3f83a752eaaedf1257f8':
fix for supporting 3 digits MNC code

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 2 Feb 2011 17:47:36 +0000 (09:47 -0800)]

Merge from gingerbread

Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 2 Feb 2011 17:45:19 +0000 (09:45 -0800)]

Merge from open-source gingerbread

Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 2 Feb 2011 17:44:16 +0000 (09:44 -0800)]

Merge "fix for supporting 3 digits MNC code" into gingerbread

commit | commitdiff | tree

Nemmara Venkateswaran [Wed, 2 Feb 2011 17:29:13 +0000 (09:29 -0800)]

am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb

* commit '47b8c96b253ab24d0df089c87ce0798d4981400a':
Fix for issue 3370023 : Wrong aspect ratio in overlay

commit | commitdiff | tree

Nemmara Venkateswaran [Wed, 2 Feb 2011 17:27:10 +0000 (09:27 -0800)]

Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb

commit | commitdiff | tree

Justin Ho [Wed, 2 Feb 2011 16:36:39 +0000 (08:36 -0800)]

am c2e16dc6: Merge "Removing red cross from hdpi emergency symbol" into honeycomb

* commit 'c2e16dc6da4f0727e79f61b0b1d85116a7840f28':
Removing red cross from hdpi emergency symbol

commit | commitdiff | tree

Justin Ho [Wed, 2 Feb 2011 16:33:45 +0000 (08:33 -0800)]

Merge "Removing red cross from hdpi emergency symbol" into honeycomb

commit | commitdiff | tree

Eric Laurent [Wed, 2 Feb 2011 16:30:57 +0000 (08:30 -0800)]

am 0990484c: am 3d4069a2: Allow TTY mode for GSM Phones

* commit '0990484c3ef96c6f0553374675b76fed54b5b164':
Allow TTY mode for GSM Phones

commit | commitdiff | tree

Eric Laurent [Wed, 2 Feb 2011 16:28:25 +0000 (08:28 -0800)]

am 3d4069a2: Allow TTY mode for GSM Phones

* commit '3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
Allow TTY mode for GSM Phones

commit | commitdiff | tree

Justin Ho [Wed, 2 Feb 2011 16:13:55 +0000 (08:13 -0800)]

am 3d5b80cb: Merge "Low battery notification sound update, alarm sound update" into honeycomb

* commit '3d5b80cb18e904b2d97414c43276ca568af27f1c':
Low battery notification sound update, alarm sound update

commit | commitdiff | tree

Justin Ho [Wed, 2 Feb 2011 16:08:15 +0000 (08:08 -0800)]

Merge "Low battery notification sound update, alarm sound update" into honeycomb

commit | commitdiff | tree

Romain Guy [Wed, 2 Feb 2011 08:49:31 +0000 (00:49 -0800)]

am c1f8bcff: Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433" into honeycomb

* commit 'c1f8bcffb8612ef5bdddc4bca6eca23804cbe453':
Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433

commit | commitdiff | tree

Romain Guy [Wed, 2 Feb 2011 08:47:21 +0000 (00:47 -0800)]

Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433" into honeycomb

commit | commitdiff | tree

Romain Guy [Wed, 2 Feb 2011 07:07:54 +0000 (23:07 -0800)]

am d51eaa64: Merge "Update layers based on the dirty region. Bug #3413433" into honeycomb

* commit 'd51eaa64e3f2d9684b2dd18ebd67734f4e0e7801':
Update layers based on the dirty region. Bug #3413433

commit | commitdiff | tree

Romain Guy [Wed, 2 Feb 2011 07:05:35 +0000 (23:05 -0800)]

Merge "Update layers based on the dirty region. Bug #3413433" into honeycomb

commit | commitdiff | tree

Romain Guy [Wed, 2 Feb 2011 06:04:31 +0000 (22:04 -0800)]

am 518813ec: Merge "New API to let apps draw without layers. Bug #3413433" into honeycomb

* commit '518813ec13153c7b02fb417720f353330e5d946e':
New API to let apps draw without layers. Bug #3413433

commit | commitdiff | tree

Romain Guy [Wed, 2 Feb 2011 06:02:00 +0000 (22:02 -0800)]

Merge "New API to let apps draw without layers. Bug #3413433" into honeycomb

commit | commitdiff | tree

Wink Saville [Wed, 2 Feb 2011 05:03:58 +0000 (21:03 -0800)]

am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb

* commit '1bf518d8b333768e26bacf340f88f7d4ba8b9a91':
Add TelephonyManager.getCurrentPhoneType

commit | commitdiff | tree

Wink Saville [Wed, 2 Feb 2011 05:02:10 +0000 (21:02 -0800)]

Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb

commit | commitdiff | tree

Michael Jurka [Wed, 2 Feb 2011 04:55:15 +0000 (20:55 -0800)]

am 46ab5e13: Merge "add missing call to superclass method" into honeycomb

* commit '46ab5e13f27324d634ff27b7fd75c5d432b915bf':
add missing call to superclass method

commit | commitdiff | tree

Michael Jurka [Wed, 2 Feb 2011 04:53:13 +0000 (20:53 -0800)]

Merge "add missing call to superclass method" into honeycomb

commit | commitdiff | tree

Dharmaray Kundargi [Wed, 2 Feb 2011 04:42:32 +0000 (20:42 -0800)]

am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes.

* commit 'c08f85a6484ee5da7062a5eac0f19912bd7e2513':
Fix issue 3414805 Crash during Overlay editing. JNI fixes.

commit | commitdiff | tree

Ben Murdoch [Wed, 2 Feb 2011 02:39:51 +0000 (18:39 -0800)]

am 3b8657de: Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb

* commit '3b8657debcbcf1bb4e66ac797d7ea15d737ecb42':
Move setExpandedTileBounds from WC to UI thread

commit | commitdiff | tree

Ben Murdoch [Wed, 2 Feb 2011 02:37:43 +0000 (18:37 -0800)]

Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb

commit | commitdiff | tree

Brian Muramatsu [Wed, 2 Feb 2011 02:10:59 +0000 (18:10 -0800)]

am 1d696fa4: Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb

* commit '1d696fa45881ff234c9b76eef8ee5aab444ba918':
Fix Incorrect Times in TimePickerDialog

commit | commitdiff | tree

Brian Muramatsu [Wed, 2 Feb 2011 02:09:36 +0000 (18:09 -0800)]

Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb

commit | commitdiff | tree

Jaikumar Ganesh [Wed, 2 Feb 2011 01:08:46 +0000 (17:08 -0800)]

am 485d577a: Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb

* commit '485d577af1b410769e1a364d8e2bf7837fb313b0':
Fix BluetoothAdapter Connection change intent doc.

commit | commitdiff | tree

Jaikumar Ganesh [Wed, 2 Feb 2011 01:06:56 +0000 (17:06 -0800)]

Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Feb 2011 00:53:09 +0000 (16:53 -0800)]

am e77f9914: Merge "Whoops, need to put this check back." into honeycomb

* commit 'e77f99144f015d9044909a4c128fa916465b0671':
Whoops, need to put this check back.

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Feb 2011 00:50:44 +0000 (16:50 -0800)]

Merge "Whoops, need to put this check back." into honeycomb

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Feb 2011 00:26:12 +0000 (16:26 -0800)]

am bd77ed7f: Merge "Make image wallpaper use a big surface." into honeycomb

* commit 'bd77ed7fff87b79008e3b071115674dff2721994':
Make image wallpaper use a big surface.

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Feb 2011 00:23:47 +0000 (16:23 -0800)]

Merge "Make image wallpaper use a big surface." into honeycomb

commit | commitdiff | tree

Wink Saville [Tue, 1 Feb 2011 23:28:10 +0000 (15:28 -0800)]

am 4b77bbd2: Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb

* commit '4b77bbd2ffc9d3a5c9dc5a03d98c7f94436173f7':
Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.

commit | commitdiff | tree

Wink Saville [Tue, 1 Feb 2011 23:24:31 +0000 (15:24 -0800)]

Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb

commit | commitdiff | tree

Paul Westbrook [Tue, 1 Feb 2011 23:09:53 +0000 (15:09 -0800)]

am 8b805ddc: Merge "Enable retrieving default download manager settings" into honeycomb

* commit '8b805ddc2eacaf7c5618619feee2154c4b18e9bf':
Enable retrieving default download manager settings

commit | commitdiff | tree

Paul Westbrook [Tue, 1 Feb 2011 23:07:40 +0000 (15:07 -0800)]

Merge "Enable retrieving default download manager settings" into honeycomb

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 1 Feb 2011 22:48:21 +0000 (14:48 -0800)]

am 066e1e3c: am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"

* commit '066e1e3cc6a0a3f2fbf672b82f8e3317574b86da':
Don't crash zygote if webcore fails to load

commit | commitdiff | tree

Romain Guy [Tue, 1 Feb 2011 22:33:01 +0000 (14:33 -0800)]

am f222956c: Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #3410819" into honeycomb

* commit 'f222956c955c97cf436c6f18b50bd0e57c89f381':
Correctly set the alpha of a hardware layer before drawing it. Bug #3410819

commit | commitdiff | tree

Mike Cleron [Tue, 1 Feb 2011 22:32:19 +0000 (14:32 -0800)]

am fb3221bf: Merge "Assume ARGB_8888 for unknown configs. Bug #3327175" into honeycomb

* commit 'fb3221bf6d9d59b792dfe4b0aa6a6567a5a92ba7':
Assume ARGB_8888 for unknown configs. Bug #3327175

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 1 Feb 2011 22:12:29 +0000 (14:12 -0800)]

Merge da20efd9

Change-Id: I2357c8f8cf001de08a28e9c48c2ca5722a92d75e

commit | commitdiff | tree

Romain Guy [Tue, 1 Feb 2011 22:00:35 +0000 (14:00 -0800)]

Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #3410819" into honeycomb

commit | commitdiff | tree

Mike Cleron [Tue, 1 Feb 2011 22:00:09 +0000 (14:00 -0800)]

Merge "Assume ARGB_8888 for unknown configs. Bug #3327175" into honeycomb

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 1 Feb 2011 21:12:04 +0000 (13:12 -0800)]

am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"

* commit 'dbf09feee0ba7210dadebbbb4cf7e7248f4ea634':
Don't crash zygote if webcore fails to load

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 1 Feb 2011 21:02:19 +0000 (13:02 -0800)]

am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"

* commit 'eb17d6f51a9776f02be84859b8980a6317abd27c':
Don't crash zygote if webcore fails to load

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 1 Feb 2011 20:41:55 +0000 (12:41 -0800)]

Merge "Don't crash zygote if webcore fails to load"

commit | commitdiff | tree

Nick Pelly [Tue, 1 Feb 2011 19:50:28 +0000 (11:50 -0800)]

am 17bf5e3c: DO NOT MERGE

* commit '17bf5e3ccfe961e6cc967327ab092cfbd6568ddd':
DO NOT MERGE

commit | commitdiff | tree

Nick Pelly [Tue, 1 Feb 2011 18:10:42 +0000 (10:10 -0800)]

am cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread

* commit 'cbf0983ec97879026e87fa97ff0b5c8786bfc8f8':
Final final final Gingerbread MR API changes.

commit | commitdiff | tree

Nick Pelly [Tue, 1 Feb 2011 17:39:31 +0000 (09:39 -0800)]

Merge "Final final final Gingerbread MR API changes." into gingerbread

commit | commitdiff | tree

Dheeraj Sharma [Tue, 1 Feb 2011 17:02:36 +0000 (09:02 -0800)]

am 22ad6243: Merge "Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb

* commit '22ad6243d7c9081e4f1a13097cfa4638cf42c3fe':
Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project

commit | commitdiff | tree

Dheeraj Sharma [Tue, 1 Feb 2011 17:00:42 +0000 (09:00 -0800)]

Merge "Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 16:46:15 +0000 (08:46 -0800)]

am 6d134754: Making default upload and download arrows more visible Bug: 3399982

* commit '6d134754ef2839da43e177b555522a5fdcb3aa9c':
Making default upload and download arrows more visible Bug: 3399982

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 15:30:11 +0000 (07:30 -0800)]

am 50bd7362: Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb

* commit '50bd7362a184a11b9c220c01662e813672d4d48e':
Updating Froyo framework assets to Holo style Bug: 3362749

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 15:28:04 +0000 (07:28 -0800)]

Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb

commit | commitdiff | tree

Kristian Monsen [Tue, 1 Feb 2011 15:19:51 +0000 (07:19 -0800)]

am 8b8f7989: Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE

* commit '8b8f79898d5d0a283c481dedda2cc161a5a673b3':
Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE

commit | commitdiff | tree

Dave Burke [Tue, 1 Feb 2011 13:15:17 +0000 (05:15 -0800)]

am 84a34059: Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)

* commit '84a34059ebee2258c77a393bba423837155aad2b':
Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)

commit | commitdiff | tree

Mike Cleron [Tue, 1 Feb 2011 07:25:02 +0000 (23:25 -0800)]

am ad97c1b1: Merge "Remove MeasuredText debug messages" into honeycomb

* commit 'ad97c1b12872042f97414b51cb58484f9a5fd9fd':
Remove MeasuredText debug messages

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 07:22:53 +0000 (23:22 -0800)]

am 7bae4325: Merge "Enable subclass of SeekBarVolumizer to provide a custom file for sample playback." into honeycomb

* commit '7bae4325877cfaf19b316157488450eefed6c381':
Enable subclass of SeekBarVolumizer to provide a custom file for sample playback.

commit | commitdiff | tree

Mike Cleron [Tue, 1 Feb 2011 07:22:36 +0000 (23:22 -0800)]

Merge "Remove MeasuredText debug messages" into honeycomb

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 07:20:24 +0000 (23:20 -0800)]

Merge "Enable subclass of SeekBarVolumizer to provide a custom file for sample playback." into honeycomb

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 07:18:46 +0000 (23:18 -0800)]

am 0a909a12: Merge "Updated notification and effects for Honeycomb Bug: 3389139" into honeycomb

* commit '0a909a12a853f9755da031e8a39b10ca6cc1e9ac':
Updated notification and effects for Honeycomb Bug: 3389139

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 07:16:58 +0000 (23:16 -0800)]

Merge "Updated notification and effects for Honeycomb Bug: 3389139" into honeycomb

commit | commitdiff | tree

Joe Onorato [Tue, 1 Feb 2011 06:17:42 +0000 (22:17 -0800)]

am 8f4fe8fe: Merge "When the data flows, the icon glows." into honeycomb

* commit '8f4fe8fe17499362bfa5b922a509fc9c61ca4b71':
When the data flows, the icon glows.

commit | commitdiff | tree

Joe Onorato [Tue, 1 Feb 2011 06:16:02 +0000 (22:16 -0800)]

Merge "When the data flows, the icon glows." into honeycomb

commit | commitdiff | tree

Dheeraj Sharma [Tue, 1 Feb 2011 06:09:24 +0000 (22:09 -0800)]

am ba2ee617: Merge "Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged" into honeycomb

* commit 'ba2ee6178ec386e838434cef902fb7de34ec6585':
Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged

commit | commitdiff | tree

Romain Guy [Tue, 1 Feb 2011 06:07:17 +0000 (22:07 -0800)]

am bc71d625: Merge "Don\'t convert 4444 images to 565. Bug #3327175" into honeycomb

* commit 'bc71d62581104b27d8373893c5485958b6f8ca37':
Don't convert 4444 images to 565. Bug #3327175

commit | commitdiff | tree

Dheeraj Sharma [Tue, 1 Feb 2011 06:06:10 +0000 (22:06 -0800)]

Merge "Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged" into honeycomb

commit | commitdiff | tree

Romain Guy [Tue, 1 Feb 2011 06:05:34 +0000 (22:05 -0800)]

Merge "Don't convert 4444 images to 565. Bug #3327175" into honeycomb

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 05:02:14 +0000 (21:02 -0800)]

am 186d8d36: Merge "Fix bug 3410400 - Holo rating bar assets" into honeycomb

* commit '186d8d36d326756ab4f25eaa8a8ed409ed2cce9b':
Fix bug 3410400 - Holo rating bar assets

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 04:59:46 +0000 (20:59 -0800)]

Merge "Fix bug 3410400 - Holo rating bar assets" into honeycomb

commit | commitdiff | tree

Jason parks [Tue, 1 Feb 2011 03:50:51 +0000 (19:50 -0800)]

am f370391f: Merge "Show the encryption boot animation." into honeycomb

* commit 'f370391f8de68f40e92075d4544ea7ac5ab75ced':
Show the encryption boot animation.

commit | commitdiff | tree

Jason parks [Tue, 1 Feb 2011 03:48:24 +0000 (19:48 -0800)]

Merge "Show the encryption boot animation." into honeycomb

commit | commitdiff | tree

Chet Haase [Tue, 1 Feb 2011 03:10:06 +0000 (19:10 -0800)]

am 2cd52c80: Merge "Fix invalidation issue with actionbar items" into honeycomb

* commit '2cd52c809e52c042ad61067c93a4b5521eadd503':
Fix invalidation issue with actionbar items

commit | commitdiff | tree

Chet Haase [Tue, 1 Feb 2011 03:08:28 +0000 (19:08 -0800)]

Merge "Fix invalidation issue with actionbar items" into honeycomb

commit | commitdiff | tree

Dharmaray Kundargi [Tue, 1 Feb 2011 03:03:36 +0000 (19:03 -0800)]

am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb

* commit '327549f9961b8cd562d1a92c1455005672aa2b95':
Fix issue 3408285. Fix issue in Thread safe in Java.

commit | commitdiff | tree

Dharmaray Kundargi [Tue, 1 Feb 2011 03:01:13 +0000 (19:01 -0800)]

Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 02:52:51 +0000 (18:52 -0800)]

am aece15a8: Merge "Updated notification panel alpha" into honeycomb

* commit 'aece15a89e4aa3bf55a4fad55852ffb6be7b6ad8':
Updated notification panel alpha

commit | commitdiff | tree

Gilles Debunne [Tue, 1 Feb 2011 02:52:38 +0000 (18:52 -0800)]

am 8f8aac5e: Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb

* commit '8f8aac5e8adfe14b8a01d90424b1815e0a0ebe28':
Pixel were missing on the last line of text when using MaxLines.

commit | commitdiff | tree

Tadashi G. Takaoka [Tue, 1 Feb 2011 02:52:32 +0000 (18:52 -0800)]

am 2a7ade6d: Merge "Update hard keyboard status on closing input methods panel" into honeycomb

* commit '2a7ade6d7ca0fc962554628dbbb446fd20f0ba52':
Update hard keyboard status on closing input methods panel

commit | commitdiff | tree

Jeff Brown [Tue, 1 Feb 2011 02:52:06 +0000 (18:52 -0800)]

am c623fff0: Merge "Fix keyboard hidden flag." into honeycomb

* commit 'c623fff00c53f6002a8ec6c98cf4fdd6b1b2ad12':
Fix keyboard hidden flag.

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Feb 2011 02:51:56 +0000 (18:51 -0800)]

am 6cf32312: Merge "Do not check features in PackageManagerService" into honeycomb

* commit '6cf32312aaee6716ffd1df7098838b08d80054e4':
Do not check features in PackageManagerService

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 02:32:20 +0000 (18:32 -0800)]

Merge "Updated notification panel alpha" into honeycomb

commit | commitdiff | tree

Eric Fischer [Tue, 1 Feb 2011 02:32:11 +0000 (18:32 -0800)]

am 122106cb: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb

* commit '122106cb9be37fb97c0315b927771ec6fcb94aa4':
Import revised translations. DO NOT MERGE. Bug 3394542

commit | commitdiff | tree

satok [Tue, 1 Feb 2011 02:31:46 +0000 (18:31 -0800)]

am 076d059b: Merge "Not to update IME when Settings version is older than the last updated version." into honeycomb

* commit '076d059b54664b31920f0be13d56c657ab77cecc':
Not to update IME when Settings version is older than the last updated version.

commit | commitdiff | tree

Justin Ho [Tue, 1 Feb 2011 02:31:23 +0000 (18:31 -0800)]

am 90a9ab56: Merge "Updating notification title close asset" into honeycomb

* commit '90a9ab56e0a41501cdd283c6e7022fd071334070':
Updating notification title close asset

commit | commitdiff | tree

Andreas Huber [Tue, 1 Feb 2011 02:31:05 +0000 (18:31 -0800)]

am 537fa17f: Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb

* commit '537fa17f21390fcb4a8d4b24f1cc80ca147ccce0':
Disconnect HTTP live sessions as soon as the request comes in.

commit | commitdiff | tree

Gilles Debunne [Tue, 1 Feb 2011 02:30:42 +0000 (18:30 -0800)]

am 0ad4f096: Merge "Patches for the Paste window behavior." into honeycomb

* commit '0ad4f0963a47feafaaa92a756fb84caab5b6bddb':
Patches for the Paste window behavior.

commit | commitdiff | tree

Gilles Debunne [Tue, 1 Feb 2011 02:14:05 +0000 (18:14 -0800)]

Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb

commit | commitdiff | tree

Tadashi G. Takaoka [Tue, 1 Feb 2011 02:04:11 +0000 (18:04 -0800)]

Merge "Update hard keyboard status on closing input methods panel" into honeycomb

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Feb 2011 01:58:08 +0000 (17:58 -0800)]

am b04ec6a8: (-s ours) am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread

* commit 'b04ec6a8a7e6a684eb4b8d434c87b76bbac9c80c':
Do not check features in PackageManagerService DO NOT MERGE

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Feb 2011 01:55:11 +0000 (17:55 -0800)]

am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread

* commit '7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
Do not check features in PackageManagerService DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 1 Feb 2011 01:48:57 +0000 (17:48 -0800)]

am 3efb3153: (-s ours) am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread

* commit '3efb3153137d310851346807fcc04e71144c5413':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Brown [Tue, 1 Feb 2011 01:45:56 +0000 (17:45 -0800)]

Merge "Fix keyboard hidden flag." into honeycomb

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Feb 2011 01:41:54 +0000 (17:41 -0800)]

Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Feb 2011 01:41:09 +0000 (17:41 -0800)]

Merge "Do not check features in PackageManagerService" into honeycomb

commit | commitdiff | tree

Eric Fischer [Tue, 1 Feb 2011 01:27:30 +0000 (17:27 -0800)]

Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb