Jeff Brown 371790b774 resolved conflicts for merge of 955e8d79 to master ...

Change-Id: I90b0d523053d173b7df60ebc975de65ab387ff18

2011-06-03 17:24:05 -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 d247ee41 to master

2011-06-03 16:16:55 -07:00

appwidget

Small change to AppWidgetProviderInfo public field name and docs

2011-02-28 14:53:09 -08:00

bluetooth

Bluetooth: correcting return value from cancelDiscovery

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

content

resolved conflicts for merge of cc20b4e3 to master

2011-06-03 15:01:49 -07:00

database

Remove the obsolete function that is not used anymore

2011-06-01 20:40:50 -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

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

resolved conflicts for merge of d247ee41 to master

2011-06-03 16:16:55 -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

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

security

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

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

resolved conflicts for merge of 54cb63e2 to master

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

view

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

webkit

Prevent WebKit updates in loadViewState case

2011-06-03 15:36:25 -07:00

widget

resolved conflicts for merge of 955e8d79 to master

2011-06-03 17:24:05 -07:00

package.html

…