Andreas Gampe db64454b33 resolved conflicts for merge of b6b9fe21 to master ...

Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9

2015-03-13 00:04:10 -07:00

..

accessibilityservice

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

accounts

…

animation

Annotate methods to be called from overrides with @CallSuper

2015-03-07 20:49:18 -08:00

annotation

Fix @ColorInt javadoc

2015-03-10 19:14:03 -07:00

app

Merge "Document behavior change of isUninstallBlocked() since L MR1"

2015-03-10 12:34:57 +00:00

appwidget

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

bluetooth

Change WiFi and Bluetooth ActivityEnergyInfo classes

2015-03-09 15:28:29 -07:00

content

Extracted a separate class to run dexopt on packages

2015-03-11 16:03:41 -07:00

database

Move apache specific portions of android.net.http to external/apache-http.

2015-02-12 11:15:49 +00:00

ddm

…

debug

…

emoji

…

gesture

Annotate ARGB integer parameters with @ColorInt

2015-03-05 16:34:12 -08:00

hardware

Merge "Camera: add @hide API for setting camera rotation"

2015-03-12 20:36:49 +00:00

inputmethodservice

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

net

resolved conflicts for merge of b6b9fe21 to master

2015-03-13 00:04:10 -07:00

nfc

…

os

Revert "Update ParcelFileDescriptor to use non-blocking I/O."

2015-03-12 21:25:00 +00:00

preference

Annotate methods to be called from overrides with @CallSuper

2015-03-07 20:49:18 -08:00

print

Add duplex mode support.

2015-02-04 05:48:48 +00:00

printservice

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

provider

Merge "Add Phone.ENTERPRISE_CONTENT_URI"

2015-03-10 22:46:23 +00:00

security

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

service

Merge "Add rename support to FingerprintManager"

2015-03-12 01:20:05 +00:00

speech

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

test

…

text

Fix android.text.cts.StaticLayoutTest#testGetEllipsisCount

2015-03-11 11:02:33 -07:00

transition

Fix TransitionManager.go not running transition.

2015-03-03 15:28:44 -08:00

util

Add new debug feature to automatically create heap dumps.

2015-03-06 16:42:03 -08:00

view

Merge "Allow polling for WindowInsets."

2015-03-12 15:12:45 +00:00

webkit

Merge "Add API for WebView OffscreenPreRaster setting."

2015-03-13 00:38:47 +00:00

widget

resolved conflicts for merge of 42f55d1e to master

2015-03-12 16:17:45 -07:00

package.html

…