The Android Automerger bdaa3abdf2 am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE ...

* commit '44e39d608cfddcbf56123480123822f26f20f259':
  DO NOT MERGE Handle GET_POWER failures
  DO NOT MERGE: Don't send pause again when coming back from full screen
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
  DO NOT MERGE MTP: Implement GetThumb command
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
  DO NOT MERGE Fix media scanner uri handling.
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
  DO NOT MERGE MTP and media provider support for multiple storage devices:
  DO NOT MERGE MountService: Fix running media scanner at boot.
  DO NOT MERGE Fix deadlock in MountService
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
  DO NOT MERGE MountService: Add support for multiple volumes

2011-05-09 10:40:14 -07:00

..

accessibilityservice

…

accounts

resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp

2011-03-22 11:47:39 -07:00

animation

Cancel LayoutTransition animations selectively

2011-03-02 18:37:31 -08:00

annotation

…

app

am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information >

2011-04-29 17:07:14 -07:00

appwidget

Small change to AppWidgetProviderInfo public field name and docs

2011-02-28 14:53:09 -08:00

bluetooth

am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

2011-04-18 15:24:47 -07:00

content

am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

2011-04-26 10:24:27 -07:00

database

cosmetic fixes: removing unused members/imports

2011-03-01 18:37:52 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Adding package description for android.hardware.usb

2011-04-04 11:07:46 -07:00

inputmethodservice

…

net

Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE

2011-05-04 09:59:30 -07:00

nfc

Implement teardown script.

2011-04-01 14:41:18 -05:00

os

am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods

2011-05-04 08:57:07 -07:00

pim

am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread

2011-02-22 21:23:50 -08:00

preference

CheckBoxPreferences do not fire accessibility events

2011-03-15 12:30:20 -07:00

provider

DO NOT MERGE MTP and media provider support for multiple storage devices:

2011-05-04 10:41:20 -04:00

security

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

server

Merge "Start using NetworkUtils.numericToInetAddress."

2011-03-02 12:10:51 -08:00

service/wallpaper

Add support for mouse hover and scroll wheel.

2011-02-25 17:06:07 -08:00

speech

am 000466d7: am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread

2011-03-18 09:15:49 -07:00

test

…

text

am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"

2011-04-29 17:15:39 -07:00

util

Remove deprecated and unused entryEvicted method.

2011-03-07 09:07:07 -08:00

view

Merged "Adjust mBiggerTouchSlopSquare to the suitable value"

2011-04-29 17:49:06 -07:00

webkit

am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE

2011-05-09 10:40:14 -07:00

widget

Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m

2011-04-29 17:35:29 -07:00

package.html

…