Jonathan Dixon 8c6a71ffd3 resolved conflicts for merge of b5539b68 to master ...

Change-Id: I946c5faeed02b5bb2577eb871e53b2e15c67ddae

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

..

accessibilityservice

…

accounts

…

animation

Fix typo in JavaDoc for TypeEvaluator.

2013-08-15 19:37:32 -07:00

annotation

…

app

Merge "Update captioning APIs" into klp-dev

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

appwidget

…

bluetooth

Fix the build.

2013-08-27 12:39:40 +01:00

content

Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev

2013-08-30 21:39:15 +00: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

Merge "Camera2: Add CameraDevice#flush()" into klp-dev

2013-08-27 16:49:04 +00:00

inputmethodservice

…

net

Add debug and remove SocketTimeoutException.

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

nfc

NFC: @hide and remove abstract from processCommandApdu().

2013-09-03 11:40:35 -07:00

os

ActivityManagerService use lmkd low memory killer daemon

2013-09-03 17:55:55 +00: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 "System print service enabled after every system reboot" into klp-dev

2013-09-03 07:24:57 +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

util

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

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

view

Merge "Add doubletap swipe to scalegesturedetector" into klp-dev

2013-09-03 17:38:36 +00:00

webkit

resolved conflicts for merge of b5539b68 to master

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

widget

am 91fa056a: am 27439903: Merge "GridLayout changes for API council" into klp-dev

2013-08-29 15:43:04 -07:00

package.html

…