Dan Morrill 61f1cbdd71 am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread ...

Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp

* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
  Adding a feature definition corresponding to support for Near-Field

2010-09-01 15:05:34 -07:00

..

accessibilityservice

Fix for bug 2448479

2010-02-17 16:46:42 -08:00

accounts

am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

2010-08-06 18:55:05 -07:00

annotation

Add Annotation for optional features.

2009-12-14 17:52:20 -08:00

app

am 17510863: New Java-based SamplingProfiler

2010-09-01 10:44:56 -07:00

appwidget

merge from open-source master

2010-07-12 15:26:21 -07:00

bluetooth

manual merge

2010-08-20 15:58:49 -07:00

content

am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread

2010-09-01 15:05:34 -07:00

database

resolved conflicts for merge of e7731f0a to gingerbread-plus-aosp

2010-08-20 18:19:03 -07:00

ddm

Added dumpHprofDataDdms() call.

2010-01-29 13:29:51 -08:00

debug

…

emoji

…

gesture

Prevent possible NPE in android.gesture.Learner

2010-02-17 10:04:39 -08:00

hardware

Remove camera metering mode API.

2010-08-30 13:33:53 -07:00

inputmethodservice

Fixed single line state on TextView.

2010-08-31 16:02:18 -07:00

net

resolved conflicts for merge of b998f311 to gingerbread-plus-aosp

2010-08-25 17:48:47 -07:00

os

resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp

2010-08-27 12:08:40 -07:00

pim

Fix vCard so that it looks at IM correctly.

2010-08-24 13:33:25 -07:00

preference

am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread

2010-08-30 18:18:54 -07:00

provider

am 042e9bd9: Add SIP related settings in the Settings.System.

2010-08-31 19:07:31 -07:00

security

…

server

am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread

2010-08-30 18:18:54 -07:00

service

Add support for new input sources.

2010-07-15 18:32:33 -07:00

speech

Fix NPE in TextToSpeech with setLanguage(null)

2010-07-26 16:11:58 -07:00

test

New test on ContextMenuInfo packed positions.

2010-02-25 13:46:50 -08:00

text

am f470ed86: Merge "Support surrogate pairs when layouting text"

2010-08-30 13:20:41 -07:00

util

Fix problems with determining when to kill apps for wake usage.

2010-08-15 17:27:29 -07:00

view

Fix doc link in InputDevice.

2010-08-30 23:29:07 -07:00

webkit

am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread

2010-09-01 14:01:44 -07:00

widget

am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread

2010-09-01 14:01:44 -07:00

package.html

…