Dianne Hackborn 0ecbdb3c16 resolved conflicts for merge of ef9876a6 to master ...

Change-Id: Ib047baa2f6746f2a069ce9ff1be2d71c450a0932

2012-05-10 23:10:32 -07:00

..

accessibilityservice

Remove activation gestures form reported and add a touch explore requesting flag.

2012-05-10 12:57:46 -07:00

accounts

…

animation

Improve animation timing.

2012-05-07 16:49:42 -07:00

annotation

…

app

am 6ad11058: am f54bfcf5: Merge "Restyling action buttons." into jb-dev

2012-05-10 15:50:20 -07:00

appwidget

Accounting for widget padding in dips instead of pixels

2012-05-09 11:13:54 -07:00

bluetooth

am 1903a732: Merge "Avoid calling BluetoothSocket.destroyNative twice" into ics-aah

2012-05-07 09:14:57 -07:00

content

am 42a419b4: am 718af32a: Merge "Use long instead of int for file offsets" into jb-dev

2012-05-10 15:00:32 -07:00

database

Deprecate certain AbstractCursor fields.

2012-05-09 14:32:14 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Avoid deadlocks when calling autoFocus from onAutoFocus callback." into jb-dev

2012-05-03 21:52:44 -07:00

inputmethodservice

Fix the issue that the ime switch icon is remaining after closing VoiceInput

2012-05-10 01:48:03 +09:00

net

Merge "Rename Uri.normalize() to Uri.normalizeScheme()." into jb-dev

2012-05-10 12:39:37 -07:00

nfc

Rename Uri.normalize() to Uri.normalizeScheme().

2012-05-10 14:31:17 -04:00

os

JellyBean is now 4.1.

2012-05-10 19:02:19 -07:00

preference

Support for changing traces from development settings.

2012-05-08 14:53:24 -07:00

provider

Remove auto-brightness adjustment knob.

2012-05-09 16:30:49 -07:00

server

When turning off, broadcast STATE_OFF in the last HotOff state

2012-05-07 11:01:23 -07:00

service

Spell check the first word of the sentence

2012-05-07 20:19:18 +09:00

speech

…

test

…

text

am 8779c022: am 0caf421e: Merge "Final fix in SpannableStringBuilder." into jb-dev

2012-05-08 11:29:49 -07:00

util

Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev

2012-05-04 13:19:41 -07:00

view

am 00389a51: am b1b55e6c: Fix build.

2012-05-10 16:34:33 -07:00

webkit

Fix locking for skip draw

2012-05-09 14:08:01 -07:00

widget

am 31b24191: am 0891a897: Merge "Polish the NumberPicker, TimePicker, and DatePicker based on UX request." into jb-dev

2012-05-10 13:04:52 -07:00

package.html

…