Katie McCormick d786a1900e resolved conflicts for merge of 37e4c405 to master ...

Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd

2013-12-02 12:37:58 -08:00

..

accessibilityservice

Add importantForAccessibility mode to block entire hierarchy

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

accounts

Remove unused imports from frameworks/base.

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

animation

Add animations along a Path.

2013-11-20 07:39:26 -08:00

annotation

Remove unused imports from frameworks/base.

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

app

resolved conflicts for merge of 37e4c405 to master

2013-12-02 12:37:58 -08:00

appwidget

Remove unused imports from frameworks/base.

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

bluetooth

Remove unused imports from frameworks/base.

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

content

am e4f96e28: am 56979b22: am 125d133b: Fix bad @see links in Intent.java.

2013-11-25 10:45:43 -08:00

database

Remove unused imports from frameworks/base.

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

ddm

Remove unused imports from frameworks/base.

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

debug

…

emoji

…

gesture

…

hardware

resolved conflicts for merge of 37e4c405 to master

2013-12-02 12:37:58 -08:00

inputmethodservice

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

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

net

am 9d4ac970: Merge "Pass DNS server info notifications to observers."

2013-11-26 08:38:48 -08:00

nfc

Remove unused imports from frameworks/base.

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

os

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

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

preference

am 4f23b610: am b95d6f54: am c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev

2013-11-21 12:22:59 -08:00

print

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

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

printservice

Complete implementation of the advanced print options.

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

provider

am 5cd1a87a: am e18b673a: am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs

2013-11-25 15:39:55 -08:00

security

…

service

Remove unused imports from frameworks/base.

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

speech

Remove unused imports from frameworks/base.

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

test

…

text

Remove unused imports from frameworks/base.

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

transition

Fix docs

2013-11-06 15:00:36 -08:00

util

am 27bd4440: am 28029658: Fix javadoc typo in SparseArray.

2013-11-21 15:32:42 -08:00

view

Remove unused imports from frameworks/base.

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

webkit

Remove unused imports from frameworks/base.

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

widget

resolved conflicts for merge of 37e4c405 to master

2013-12-02 12:37:58 -08:00

package.html

…