Conley Owens dddaa56f79 Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m ...

Conflicts:
	core/java/android/widget/ScrollView.java

Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80

2011-04-29 17:35:29 -07:00

..

accessibilityservice

…

accounts

resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp

2011-03-22 11:47:39 -07:00

animation

Cancel LayoutTransition animations selectively

2011-03-02 18:37:31 -08:00

annotation

…

app

am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information >

2011-04-29 17:07:14 -07:00

appwidget

Small change to AppWidgetProviderInfo public field name and docs

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

bluetooth

am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

2011-04-18 15:24:47 -07:00

content

am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

2011-04-26 10:24:27 -07:00

database

cosmetic fixes: removing unused members/imports

2011-03-01 18:37:52 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Adding package description for android.hardware.usb

2011-04-04 11:07:46 -07:00

inputmethodservice

Follow up change to I741642ac

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

net

Make new networkAttribute parameter non-optional.

2011-04-25 16:04:45 -07:00

nfc

Implement teardown script.

2011-04-01 14:41:18 -05:00

os

am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.

2011-04-11 14:23:59 -07:00

pim

am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread

2011-02-22 21:23:50 -08:00

preference

CheckBoxPreferences do not fire accessibility events

2011-03-15 12:30:20 -07:00

provider

new LTE prepay related values

2011-04-22 16:42:57 -07:00

security

Removing android.security.MessageDigest

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

server

Merge "Start using NetworkUtils.numericToInetAddress."

2011-03-02 12:10:51 -08:00

service/wallpaper

Add support for mouse hover and scroll wheel.

2011-02-25 17:06:07 -08:00

speech

am 000466d7: am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread

2011-03-18 09:15:49 -07:00

test

…

text

am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"

2011-04-29 17:15:39 -07:00

util

Remove deprecated and unused entryEvicted method.

2011-03-07 09:07:07 -08:00

view

Fixed bad merge in ViewRoot.java.

2011-04-28 11:06:34 -07:00

webkit

am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

2011-04-07 17:25:56 -07:00

widget

Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m

2011-04-29 17:35:29 -07:00

package.html

…