Irfan Sheriff cf99765b62 resolved conflicts for merge of 914ed90f to honeycomb-LTE ...

Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e

2011-06-22 11:01:16 -07:00

..

accessibilityservice

…

accounts

Fix a deadlock in AccountManagerService cause by different

2011-03-01 11:23:19 -08:00

animation

Cancel LayoutTransition animations selectively

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

annotation

…

app

am 2f04883f: SDK only: integrate new sample code, deprecating along the way.

2011-06-16 15:22:10 -07:00

appwidget

Small change to AppWidgetProviderInfo public field name and docs

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

bluetooth

Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

2011-04-18 14:55:10 -07:00

content

Add new landscape and portrait orientation features.

2011-06-14 11:23:52 -07:00

database

cosmetic fixes: removing unused members/imports

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

ddm

…

debug

…

emoji

…

gesture

…

hardware

USB: Add method to access raw USB device descriptors

2011-05-19 12:57:41 -04:00

inputmethodservice

…

net

resolved conflicts for merge of 914ed90f to honeycomb-LTE

2011-06-22 11:01:16 -07:00

nfc

am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2

2011-05-25 15:41:51 -07:00

os

am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2

2011-06-15 17:10:33 -07:00

pim

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

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

preference

Stability fixes for PreferenceFragments.

2011-06-14 15:07:49 -07:00

provider

am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2

2011-06-02 17:28:07 -07:00

security

…

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

Fix bug 3511256 invalid TTS parameter cache size

2011-03-03 18:55:19 -08:00

test

…

text

Work on issue #4518815: Compatibility mode introduces compatibility regression...

2011-06-08 18:45:43 -07:00

util

Add "tv" density for 720p screens.

2011-05-27 13:40:26 -07:00

view

am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2

2011-06-08 22:35:25 -07:00

webkit

fix one NPE when webChromeClient don't have progress view support

2011-06-10 10:56:33 -07:00

widget

Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2

2011-06-03 10:26:18 -07:00

package.html

…