Nick Pelly 8f912d1202 resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp" ...

Conflicts:
	api/current.xml

Change-Id: Ib6556fa54f49d4b55719dae79662d54f1530e76e

2011-01-21 08:55:38 -08:00

..

accessibilityservice

…

accounts

Token cache was not reset on password change

2011-01-19 12:00:32 -08:00

animation

Doc change: animation devguide topic

2011-01-19 21:39:45 -08:00

annotation

…

app

am 9a161b09: Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb

2011-01-20 21:42:31 -08:00

appwidget

previewImage API shouldn't be hidden.

2011-01-19 21:39:01 -08:00

bluetooth

docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag

2011-01-19 21:13:18 -08:00

content

am 48395385: Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb

2011-01-18 11:18:37 -08:00

database

bug:3362394 better documentation for DefaultDatabaseErrorHandler class

2011-01-17 15:35:28 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Enable camera preview to a SurfaceTexture.

2011-01-07 17:40:24 -08:00

inputmethodservice

Merge "Show ime switch icon when there is a hard keyboard" into honeycomb

2011-01-20 19:47:43 -08:00

net

Pick an upstream interface with valid IP config

2011-01-17 13:50:48 -08:00

nfc

Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)

2011-01-18 15:39:34 -08:00

os

StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties

2011-01-20 16:29:52 -08:00

pim

Refrain warning when not appropriate. Do not merge

2010-10-04 07:59:34 -07:00

preference

Fix bug 3362375 - API REVIEW: remove unused public 'up' id

2011-01-20 13:25:08 -08:00

provider

Add android.provider.Settings.EXTRA_INPUT_METHOD_ID

2011-01-21 00:15:29 +09:00

security

…

server

Make connection / disconnect failure more robust.

2011-01-19 14:06:29 -08:00

service/wallpaper

am 54f428a6: am bdb7aee0: Merge "Fix for crash when setting live wallpaper."

2011-01-13 10:26:19 -08:00

speech

Fix bug 2084122: enable application control over text synth volume

2011-01-11 13:42:44 -08:00

test

Added RepetitiveTest annotation and test runner support

2010-10-19 18:23:18 -07:00

text

MaxLines is respected in TextViews, even when ellipsize is set to end.

2011-01-04 18:05:53 -08:00

util

Patch new JSON APIs with changes informed by GSON.

2011-01-10 12:56:31 -08:00

view

am ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb

2011-01-20 23:09:34 -08:00

webkit

Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb

2011-01-20 11:08:33 -08:00

widget

Merge "Cleaning up some StackView bad behavior" into honeycomb

2011-01-20 19:42:23 -08:00

package.html

…