Brad Fitzpatrick 3a5bfa7b4f am b8796212: resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp ...

* commit 'b8796212e3544262193960ade01db6cb2023c8f9':
  Fixing self-assignment in cloning code.

2011-03-15 11:57:44 -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

resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp

2011-03-15 11:54:46 -07:00

appwidget

Small change to AppWidgetProviderInfo public field name and docs

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

bluetooth

Refactor android.server.BluetoothService classes.

2011-02-24 16:26:20 -08:00

content

am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread

2011-03-02 15:16:32 -08:00

database

cosmetic fixes: removing unused members/imports

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

ddm

…

debug

…

emoji

…

gesture

…

hardware

Add support for USB accessory serial numbers

2011-03-14 20:10:47 -04:00

inputmethodservice

…

net

am 40b207c1: Merge "Using proper key for removing object from the map."

2011-03-15 11:30:04 -07:00

nfc

Implement new NFC-EE API's as shared library (frameworks/base).

2011-03-10 16:03:46 -08:00

os

Clarify rules about encryption of emulated storage.

2011-03-07 19:13:42 -08:00

pim

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

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

preference

Fix issues #4087362 and #4087356

2011-03-11 13:48:32 -08:00

provider

am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread

2011-03-14 13:34:18 -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

Exception handling clean-up in TextToSpeech.java

2011-03-08 11:53:12 +00:00

test

…

text

Merge changes I81fc2f90,I5e7fd759

2011-03-15 10:56:16 -07:00

util

Remove deprecated and unused entryEvicted method.

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

view

Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1

2011-03-14 18:16:39 -07:00

webkit

am 15c9ab33: am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1

2011-03-14 18:37:18 -07:00

widget

am 6d4f318f: am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1

2011-03-14 23:17:58 -07:00

package.html

…