Kenny Root 7dbf0696ef resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp ...

Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c

2011-01-26 11:10:36 -08:00

..

accessibilityservice

…

accounts

Merge "If 'customTokens', let authenticator handle notification." into honeycomb

2011-01-25 16:13:12 -08:00

animation

Use optimized display lists for all hwaccelerated rendering

2011-01-24 08:43:20 -08:00

annotation

…

app

am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb

2011-01-25 15:25:39 -08:00

appwidget

previewImage API shouldn't be hidden.

2011-01-19 21:39:01 -08:00

bluetooth

Revert "Temporary Changes for certification of SCO."

2011-01-26 09:08:50 -08:00

content

am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb

2011-01-25 15:19:17 -08:00

database

bug:3362394 better documentation for DefaultDatabaseErrorHandler class

2011-01-17 15:35:28 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread

2011-01-21 15:02:26 -08:00

inputmethodservice

Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb

2011-01-25 05:42:36 -08:00

net

Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle

2011-01-24 18:17:21 -08:00

nfc

Merge "Use classnames instead of ints for NFC techs." into gingerbread

2011-01-25 14:35:46 -08:00

os

resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp

2011-01-26 11:10:36 -08:00

pim

…

preference

Fix bug 3362375 - API REVIEW: remove unused public 'up' id

2011-01-20 13:25:08 -08:00

provider

New orientation listener.

2011-01-24 13:46:57 -08:00

security

…

server

Do Not Merge. Don't connect to non keyboard HID devices.

2011-01-25 17:38:11 -08:00

service/wallpaper

am 3168a137: Merge "Fix surface frame size reporting." into honeycomb

2011-01-25 14:48:14 -08:00

speech

resolved conflicts for merge of 3ebade5d to honeycomb-plus-aosp

2011-01-24 09:35:57 -08:00

test

…

text

Merge "Fix for a call to startActivity from outside of an app." into honeycomb

2011-01-25 14:20:09 -08:00

util

Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...

2011-01-24 21:23:03 -08:00

view

am f5b27e35: Merge "Fix NPE in YouTube. Bug #3385339" into honeycomb

2011-01-26 10:56:08 -08:00

webkit

Merge "Move last touch point when moving the cursor node." into honeycomb

2011-01-26 10:06:42 -08:00

widget

Merge "Cleaning up StackView" into honeycomb

2011-01-25 20:19:17 -08:00

package.html

…