Narayan Kamath 3a951e52d9 resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp ...

Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a

2014-05-01 15:32:20 +01:00

..

accessibilityservice

Add importantForAccessibility mode to block entire hierarchy

2013-10-02 17:41:15 -07:00

accounts

am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.

2014-02-27 11:24:05 -08:00

animation

AArch64: Use of long for pointers in PropertyValuesHolder

2014-01-29 10:47:27 +00:00

annotation

Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

2014-03-22 13:33:43 -07:00

app

am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"

2014-04-30 19:11:05 +00:00

appwidget

…

bluetooth

DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request

2014-04-21 14:26:56 -04:00

content

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

database

Fix NPE in deleteDatabase().

2014-01-24 13:20:57 -08:00

ddm

Use Runtime.gc instead of System.gc for DDMS.

2014-04-28 11:07:22 -07:00

debug

Remove unused JNITest class

2014-02-21 14:34:35 +00:00

emoji

Use long for pointers in EmojiFactory and PdfDocument

2014-01-31 12:03:28 +00:00

gesture

Fix hardware layers lifecycle

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

hardware

am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev

2014-04-17 21:53:34 +00:00

inputmethodservice

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

2013-11-22 11:18:57 -08:00

net

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

nfc

NFC: getNdefMessage() should throw exception if no tag in field.

2014-01-28 15:20:30 +01:00

os

resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp

2014-05-01 15:32:20 +01:00

preference

Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev

2013-11-21 20:12:13 +00:00

print

PrintSpooler crash if printer is reported to have only one color mode.

2014-03-12 14:20:27 -07:00

printservice

Complete implementation of the advanced print options.

2013-10-28 11:44:07 -07:00

provider

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

security

Add argument to binder call to check key types

2013-09-10 18:49:40 +00:00

service

Plumb display power state through display manager.

2014-04-10 20:46:14 -07:00

speech

Make InternalListener static to avoid referencing SpeechRecognizer.

2014-03-18 01:58:39 +00:00

test

…

text

Followon fix for 14276128 Clipping at bottom of TextView

2014-04-28 18:02:27 +00:00

transition

Merge "Fix leak in TransitionInflater" into klp-dev

2013-10-31 21:38:21 +00:00

util

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

view

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

webkit

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

widget

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

package.html

…