Sailesh Nepal 00ffde305d resolved conflicts for merge of 2d72d000 to master-nova ...

Change-Id: Icfb617ffab2da2f8805e4628e75e006c620b479d

2014-03-25 13:02:59 -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

resolved conflicts for merge of 74fb97de to master

2014-03-25 11:08:19 -07: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

Merge "Implement APIs for obtaining, caching themed Drawables"

2014-03-25 01:26:15 +00:00

database

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

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

ddm

…

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

Merge "camera3: Update whiteLevel/greenSplit docs."

2014-03-25 00:12: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

am 7434fcec: Merge "Add support for enabled state for SearchIndexableData"

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

security

…

service

Manually merge commit '2faf28cf' into master

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

speech

Documentation update for TextToSpeech#getFeatures

2014-03-24 15:07:03 +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 "Fix doc build"

2014-03-25 18:08:30 +00:00

webkit

Switch WebView to onDetachedFromWindowInternal

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

widget

Implement APIs for obtaining, caching themed Drawables

2014-03-24 18:00:26 -07:00

package.html

…