Craig Mautner 9e4adfb358 resolved conflicts for merge of 32360147 to master ...

Change-Id: I97cc95f66df50006469f8debd286966cc21edb60

2014-02-04 15:55:19 -08:00

..

accessibilityservice

…

accounts

Add APIs for obtaining themed Drawable from Theme, Context

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

animation

AArch64: Use of long for pointers in PropertyValuesHolder

2014-01-29 11:07:06 +00:00

annotation

Hide NonNull and Nullable.

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

app

resolved conflicts for merge of 32360147 to master

2014-02-04 15:55:19 -08:00

appwidget

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

bluetooth

am 1ece04f3: Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev

2014-01-28 20:44:25 +00:00

content

Add APIs for obtaining themed Drawable from Theme, Context

2014-02-03 18:42:24 -08: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

…

emoji

…

gesture

…

hardware

camera3: Update maxRegions tag.

2014-02-03 17:54:24 -08:00

inputmethodservice

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

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

net

am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev

2014-01-31 08:11:57 +00:00

nfc

Adding accessor for integer tech codes to Tag

2013-12-16 10:46:36 -08:00

os

Merge "More battery history improvements."

2014-02-03 21:32:33 +00:00

preference

Add APIs for obtaining themed Drawable from Theme, Context

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

print

Avoid NPE and add a warning log if a printing app misbehaves.

2013-11-13 17:31:15 -08:00

printservice

…

provider

SystemUI support for notification visibility.

2014-01-30 13:23:14 -05:00

security

…

service

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

speech

Add public SynthesisRequestV2 constructor.

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

test

…

text

Add APIs for obtaining themed Drawable from Theme, Context

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

transition

Add support for cross-activity scenes and transitions

2013-12-05 10:06:19 -08:00

util

am 065d998a: Merge "Hide an old debug function." into klp-modular-dev

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

view

Check for null display list

2014-02-04 14:19:06 -08:00

webkit

Remove defunct flag

2014-01-27 13:39:24 -08:00

widget

Add APIs for obtaining themed Drawable from Theme, Context

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

package.html

…