Chet Haase 4918e7ad66 resolved conflicts for merge of 09ed0720 to master ...

Change-Id: I1ce1b48a9fb954caf4fd15237f2f608ac9c478fe

2013-09-04 17:19:44 -07:00

..

accessibilityservice

add attributes to accessibility service info

2013-06-06 18:37:59 -07:00

accounts

…

animation

Transition API changes from API council recommendations

2013-09-04 14:46:38 -07:00

annotation

…

app

Merge "Update captioning APIs" into klp-dev

2013-08-30 21:34:43 +00:00

appwidget

am 18748035: am 379517b0: Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev

2013-06-05 11:50:47 -07:00

bluetooth

Merge "Block ble adv api based on resource config" into klp-dev

2013-09-03 22:36:09 +00:00

content

am 1b6d0891: am 11254ade: Merge "Add provideAssistData attr to public.xml" into klp-dev

2013-09-04 05:27:10 -07:00

database

Docs changes pursuant to API review feedback.

2013-08-23 17:44:47 -07:00

ddm

Change IsMethodTracingActive to GetMethodTracingMode for frameworks.

2013-08-30 14:40:26 -07:00

debug

…

emoji

…

gesture

Fix hardware layers lifecycle

2013-08-16 18:38:29 -07:00

hardware

Camera2: Clarified docs for 3A regions.

2013-09-04 21:07:13 +00:00

inputmethodservice

Fix possible NPE in IInputMethodWrapper

2013-07-01 19:19:31 +09:00

net

Add debug and remove SocketTimeoutException.

2013-08-29 16:42:44 -07:00

nfc

Merge "Reader mode NFC API: move to callback model." into klp-dev

2013-09-04 00:48:20 +00:00

os

am 55e4889c: am 61edc94a: Merge "Make location QuickSettings multi-user compatible (b/10563313)" into klp-dev

2013-09-04 12:28:09 -07:00

preference

Merge "Allow recycling of Preferences in com.android.* packages" into klp-dev

2013-08-21 01:58:55 +00:00

print

Print spooler security and some new print service facing APIs.

2013-08-29 15:39:44 -07:00

printservice

Bug fixes in the printer dialog activity and fused printer loader.

2013-09-03 08:42:17 -07:00

provider

Merge "wifi-display: add a global setting to force WPS config method" into klp-dev

2013-09-04 22:07:05 +00:00

security

Add support for DSA and ECDSA key types

2013-09-03 00:53:04 -07:00

service

StatusBarNotification cleanup.

2013-07-26 10:42:56 -04:00

speech

Fix SynthesisRequest javadoc

2013-09-02 16:41:05 +01:00

test

…

text

am 98c9491f: am 39e885dc: Merge "Make MeasuredText.sCached field final"

2013-08-29 22:06:57 -07:00

transition

Transition API changes from API council recommendations

2013-09-04 14:46:38 -07:00

util

Fix bug #10549094 KLP API Review: android.util.LayoutDirection

2013-08-29 18:13:28 -07:00

view

Transition API changes from API council recommendations

2013-09-04 14:46:38 -07:00

webkit

resolved conflicts for merge of b5539b68 to master

2013-09-03 12:15:55 -07:00

widget

Fix the build, use viscous fluid interpolator in OverScroller

2013-09-04 16:37:57 -07:00

package.html

…