Jake Hamby d4f1bacca5 resolved conflicts for merge of 7ca13deb to master ...

Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae

2011-06-08 23:20:09 -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

Implement shared-storage full backup/restore

2011-06-07 12:16:27 -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

Intent to manage application network data usage.

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

database

Remove the obsolete function that is not used anymore

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

ddm

…

debug

…

emoji

…

gesture

Fix javadoc issues

2011-05-16 11:53:31 -07:00

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

The service part of the user space VPN support.

2011-06-08 14:16:42 -07:00

nfc

Merge "Move NDEF URI helper method into android.nfc.NfcRecord"

2011-06-08 13:44:28 -07:00

os

Merge "StorageVolume: Add allowMassStorage flag"

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

pim

…

preference

Manual merge. Preference activity changes to work on smaller tablet screens and phones.

2011-05-26 15:20:14 -07:00

provider

resolved conflicts for merge of 7ca13deb to master

2011-06-08 23:20:09 -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

Rename ViewRoot to ViewAncestor.

2011-05-04 14:08:11 -07:00

speech

Fix the threading behaviour of TTS audio requests.

2011-06-07 16:27:18 +01:00

test

…

text

Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews"

2011-05-31 10:41:58 -07:00

util

Add 'Property' object

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

view

Merge "AccessibilityNodeInfo and AccessibilityEvent to initialized properly."

2011-06-08 19:44:20 -07:00

webkit

Fix initial zoom with loadViewState

2011-06-08 18:00:02 -07:00

widget

Rename atribute View horizontalDirection to layoutDirection and update unit tests

2011-06-07 14:21:31 -07:00

package.html

…