Narayan Kamath 0033539a43 resolved conflicts for merge of ab98aec6 to master ...

Change-Id: I773bce338ebc42f7428d9942d22ed140bcfbf3d9

2013-09-09 09:59:31 +01:00

..

accessibilityservice

…

accounts

…

animation

Transition API changes from API council recommendations

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

annotation

…

app

Provide calling package to ContentProviders.

2013-09-06 08:08:18 -07:00

appwidget

…

bluetooth

Allow L2CAP sockets

2013-09-06 12:27:12 -07:00

content

resolved conflicts for merge of ab98aec6 to master

2013-09-09 09:59:31 +01: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 "Sensor batching APIs for review." into klp-dev

2013-09-06 22:30:19 +00:00

inputmethodservice

Fix possible NPE in IInputMethodWrapper

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

net

Fix docs build.

2013-09-06 22:53:16 -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 cbf2b02d: am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev

2013-09-06 18:41:43 -07:00

preference

Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev

2013-09-05 23:36:18 +00:00

print

Printers for a disappearing print serivce incorrectly removed.

2013-09-06 14:50:22 -07:00

printservice

Merge "Print API updated." into klp-dev

2013-09-05 05:36:51 +00:00

provider

Provide calling package to ContentProviders.

2013-09-06 08:08:18 -07:00

security

Add argument to binder call to check key types

2013-09-05 13:27:00 -07:00

service

StatusBarNotification cleanup.

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

speech

Fixing build break

2013-09-06 18:04:48 -07: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

Merge "Fix issue #10491028: iabv2 test apps that contain subscription SKUs..." into klp-dev

2013-09-05 22:20:55 +00:00

view

Merge "Remove tap to click from touch nav devices" into klp-dev

2013-09-07 02:04:46 +00:00

webkit

am 708d279a: am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev

2013-09-06 09:52:49 -07:00

widget

am f094655c: am a73c3a54: Merge "Add View#cancelPendingInputEvents API" into klp-dev

2013-09-05 12:43:32 -07:00

package.html

…