Jeff Brown 774ed9d953 resolved conflicts for merge of 8b2c0014 to master ...

Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361

2011-06-07 17:48:39 -07:00

..

accessibilityservice

Interrogation of the view hierarchy from an AccessibilityService.

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

accounts

…

animation

Add ability to transition parent hierarchy in layout transitions

2011-05-24 15:29:39 -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

Implement shared-storage full backup/restore

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

Improve android.hardware.Camera.Area javadoc.

2011-06-07 19:00:03 +08:00

inputmethodservice

Handle action modes in the IME extract mode view.

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

net

Makes SSLCertificateSocketFactory more flexible

2011-06-06 15:10:33 -07:00

nfc

Connecting to a NFC technology may fail.

2011-06-06 12:43:05 +02: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

Merge "Update walled garden detection logic"

2011-06-07 15:16:00 -07:00

security

…

server

am e2271a55: am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."

2011-05-21 21:35:16 -07:00

service/wallpaper

Rename ViewRoot to ViewAncestor.

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

speech

Language loading / availablity should repsect defaults enforcement.

2011-06-02 17:28:57 +01:00

test

…

text

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

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

util

Interrogation of the view hierarchy from an AccessibilityService.

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

view

resolved conflicts for merge of 8b2c0014 to master

2011-06-07 17:48:39 -07:00

webkit

am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2

2011-06-07 17:18:48 -07:00

widget

Rename atribute View horizontalDirection to layoutDirection and update unit tests

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

package.html

…