Daniel Sandler 32cd1d5053 resolved conflicts for merge of 31796297 to master ...

Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1

2011-02-07 16:12:16 -05:00

..

accessibilityservice

…

accounts

Add TelephonyManager.getCurrentPhoneType

2011-02-01 19:22:15 -08:00

animation

Fixed LayoutTransition bug moving multiple views

2011-01-28 15:54:37 -08:00

annotation

…

app

resolved conflicts for merge of 31796297 to master

2011-02-07 16:12:16 -05:00

appwidget

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00

bluetooth

am 25bbfda2: am 485d577a: Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb

2011-02-01 17:12:23 -08:00

content

Merge "Move handing of a "cancel" inside try-finally block"

2011-02-07 12:20:36 -08:00

database

bug:3385018 don't print finalizer warnings under certain conditions

2011-01-30 14:42:36 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

UsbService: Blacklist HID boot subclass devices (keyboards and mice)

2011-02-01 15:53:11 -05:00

inputmethodservice

Follow up change to I741642ac

2011-01-30 11:02:09 +09:00

net

Place the DHCP server address in the "next server IP address"

2011-02-03 17:32:39 -08:00

nfc

Fix docs type that broke build.

2011-02-03 16:23:58 -08:00

os

am 66700397: Merge 3100207b from gingerbread-plus-aosp

2011-01-29 14:54:43 -08:00

pim

…

preference

Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb

2011-02-03 18:39:39 -08:00

provider

Merge "Add a protocol property to the APNs and use it."

2011-02-04 17:41:11 -08:00

security

Removing android.security.MessageDigest

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

server

Merge "Wait till SDP records are registered before sending intent."

2011-02-03 17:27:10 -08:00

service/wallpaper

am 46ab5e13: Merge "add missing call to superclass method" into honeycomb

2011-02-01 20:55:15 -08:00

speech

resolved conflicts for merge of a314f32b to honeycomb-merge

2011-01-28 13:16:46 -08:00

test

…

text

am b118bd1c: am ad97c1b1: Merge "Remove MeasuredText debug messages" into honeycomb

2011-02-01 13:25:40 -08:00

util

Optimize IntentResolver to reduce lookup time by 50%.

2011-01-28 17:34:01 -08:00

view

am a37a81d7: am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb

2011-02-07 11:40:51 -08:00

webkit

Save form data when submitted.

2011-02-04 11:43:19 -05:00

widget

NumberPicker should not play initial animation while in edit mode

2011-02-02 15:17:24 -08:00

package.html

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00