Dianne Hackborn 8a7d44e824 resolved conflicts for merge of 54cb63e2 to master ...

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10

2011-06-02 16:44:52 -07:00

..

accessibilityservice

Accessibility serviceconfiguration via meta-data

2011-05-31 12:04:18 -07:00

accounts

…

animation

Add ability to transition parent hierarchy in layout transitions

2011-05-24 15:29:39 -07:00

annotation

…

app

resolved conflicts for merge of 5c2e4d20 to master

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

appwidget

…

bluetooth

Bluetooth: correcting return value from cancelDiscovery

2011-06-02 10:30:49 -07:00

content

am da9837fb: am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2

2011-06-02 16:24:12 -07:00

database

Enable strict mode as a public api to catch sql injections

2011-06-01 15:24:23 -07:00

ddm

…

debug

…

emoji

…

gesture

Fix javadoc issues

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

hardware

resolved conflicts for merge of c1730dcf to master

2011-05-19 13:34:44 -04:00

inputmethodservice

Handle action modes in the IME extract mode view.

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

net

Collect historical network stats.

2011-06-01 17:44:52 -07:00

nfc

am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2

2011-05-31 16:00:46 -07:00

os

am ca6c3a2b: am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2

2011-06-02 14:06:11 -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

Work on changing syncx to cal_syncx

2011-05-31 13:25:10 -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

Add a separate thread for writing to audiotracks.

2011-05-25 15:31:06 +01:00

test

…

text

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

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

util

resolved conflicts for merge of 54cb63e2 to master

2011-06-02 16:44:52 -07:00

view

Merge "Improve ViewDebug informations for View and LineaLayout"

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

webkit

Make sure scale will not go beyond overview scale after rotation.

2011-06-02 14:11:57 -07:00

widget

Improve ViewDebug informations for View and LineaLayout

2011-06-02 15:57:01 -07:00

package.html

…