Dianne Hackborn f741e679c4 resolved conflicts for merge of e2aa0490 to master ...

Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067

2011-06-09 17:50:36 -07:00

..

accessibilityservice

Interrogation of the view hierarchy from an AccessibilityService.

2011-06-06 18:46:03 -07:00

accounts

…

animation

Add 'Property' object

2011-06-08 09:42:37 -07:00

annotation

…

app

resolved conflicts for merge of e2aa0490 to master

2011-06-09 17:50:36 -07:00

appwidget

…

bluetooth

am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"

2011-06-06 12:56:55 -07:00

content

resolved conflicts for merge of e2aa0490 to master

2011-06-09 17:50:36 -07:00

database

Remove the obsolete function that is not used anymore

2011-06-01 20:40:50 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast"

2011-06-08 09:42:54 -07:00

inputmethodservice

Handle action modes in the IME extract mode view.

2011-06-02 13:29:37 -07:00

net

Persist network stats using AtomicFile.

2011-06-09 10:14:13 -07:00

nfc

Added support for rediscovering a Tag (API).

2011-06-08 23:26:42 +02:00

os

Merge "StorageVolume: Add allowMassStorage flag"

2011-06-07 12:44:52 -07:00

pim

…

preference

Add SwitchPreference

2011-06-08 18:25:27 -07:00

provider

Merge "Add return value spec and fix typo."

2011-06-09 16:34:10 -07:00

security

…

server

am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread

2011-05-27 13:46:50 -07:00

service/wallpaper

…

speech

Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes.

2011-06-09 16:42:16 +01:00

test

…

text

am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2

2011-06-08 20:06:40 -07:00

util

Merge "Move CalendarUtils into Calendar app"

2011-06-09 14:07:04 -07:00

view

resolved conflicts for merge of e2aa0490 to master

2011-06-09 17:50:36 -07:00

webkit

Consider default zoom scale for mobile viewport.

2011-06-09 16:02:34 -07:00

widget

Text selection on phone

2011-06-09 10:47:03 -07:00

package.html

…