Jose Lima e911813840 resolved conflicts for merge of 6c45157c to master ...

Change-Id: I95d7f927f4321405318b44a21172b99f3f16e00a

2014-03-24 15:33:25 -07:00

..

accessibilityservice

Added accessibility APIs for introspecting interactive windows.

2014-03-20 16:52:59 +00:00

accounts

Add APIs for obtaining themed Drawable from Theme, Context

2014-02-03 18:42:24 -08:00

animation

Fix problem on Animator with a start delay.

2014-03-21 16:13:37 -07:00

annotation

Hide NonNull and Nullable.

2013-12-17 08:44:38 -08:00

app

am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev

2014-03-24 21:25:21 +00:00

appwidget

App widget backup/restore infrastructure

2014-03-20 12:30:51 -07:00

bluetooth

Get rid of not specifying a user errors in bluetooth.

2014-03-20 10:10:03 -07:00

content

resolved conflicts for merge of 6c45157c to master

2014-03-24 15:33:25 -07:00

database

am df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev

2014-01-28 00:13:27 +00:00

ddm

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05: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

…

hardware

am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev

2014-03-24 21:25:21 +00:00

inputmethodservice

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

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

net

am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."

2014-03-24 17:34:11 +00:00

nfc

am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."

2014-03-06 16:21:46 +00:00

os

Merge "Battery stats: wake locks, radio active, cleanup."

2014-03-24 20:42:31 +00:00

preference

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

print

Merge "Update print docs"

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

printservice

…

provider

Add support for enabled state for SearchIndexableData

2014-03-21 11:37:57 -07:00

security

…

service

Manually merge commit '2faf28cf' into master

2014-03-04 15:25:43 -08:00

speech

Do not reset language in case of the TTS service reconnect.

2014-03-21 11:21:07 +00:00

test

…

text

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

transition

Fix problem with Animators pausing the wrong Window.

2014-03-06 14:36:28 -08:00

util

Added accessibility APIs for introspecting interactive windows.

2014-03-20 16:52:59 +00:00

view

Merge "Rework Outline API, remove isolatedZVolume remnants"

2014-03-24 21:22:36 +00:00

webkit

Switch WebView to onDetachedFromWindowInternal

2014-03-06 15:54:54 -08:00

widget

Rename DisplayList->RenderNode

2014-03-17 10:30:32 -07:00

package.html

…