Dianne Hackborn ed60f81940 resolved conflicts for merge of 76450622 to master ...

Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83

2011-06-02 09:20:52 -07:00

..

accessibilityservice

Accessibility serviceconfiguration via meta-data

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

accounts

Tolerate missing AccountManager resource, not just missing resource name

2011-04-07 11:58:37 -07:00

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 76450622 to master

2011-06-02 09:20:52 -07:00

appwidget

…

bluetooth

Add public api BluetoothSocket.isConnected.

2011-05-23 17:47:35 -07:00

content

resolved conflicts for merge of 76450622 to master

2011-06-02 09:20:52 -07:00

database

Enable strict mode as a public api to catch sql injections

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

ddm

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

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

Add initial API for stylus and mouse buttons.

2011-05-13 12:11:17 -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

Collect historical network stats.

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

pim

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

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 76450622 to master

2011-06-02 09:20:52 -07:00

view

resolved conflicts for merge of 76450622 to master

2011-06-02 09:20:52 -07:00

webkit

Merge "Correctly detect when switching back from full screen"

2011-06-01 15:53:18 -07:00

widget

Merge "Fix bug #4509967 (layout_gravity not always respected)"

2011-06-01 17:40:11 -07:00

package.html

…