Michael Wright 6484c0e013 Merge addition of supports-input tag into master ...

aapt has been moved out of f/b which caused merged conflicts in
the original commit

Conflicts:
	tools/aapt/Command.cpp

Change-Id: I181ac6a3382eb4858110b30c64fc734a8af4929b

2013-09-06 09:39:34 -07:00

..

accessibilityservice

…

accounts

…

animation

Transition API changes from API council recommendations

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

annotation

…

app

Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev

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

appwidget

…

bluetooth

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

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

content

Merge addition of supports-input tag into master

2013-09-06 09:39:34 -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

Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev

2013-09-05 01:23:40 +00:00

inputmethodservice

…

net

Merge "Add a function to replace all the link addresses." into klp-dev

2013-09-05 23:03:24 +00:00

nfc

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

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

os

am 3d27c9f9: am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev

2013-09-05 17:33:19 -07:00

preference

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

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

print

Bug fixes in the print dialog

2013-09-05 11:34:32 -07:00

printservice

Merge "Print API updated." into klp-dev

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

provider

Merge "Filter roots based on supported MIME types." into klp-dev

2013-09-05 21:19:39 +00:00

security

Add argument to binder call to check key types

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

service

…

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

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

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

view

Merge "Add View#cancelPendingInputEvents API" into klp-dev

2013-09-05 19:37:51 +00:00

webkit

am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev

2013-09-05 10:13:34 -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

…