Griff Hazen daf5c0ebd0 Merge commit '583c7c56' into master ...

Change-Id: I89c2c63005fbb6b1c058b2022f4469be5244505f

2015-03-23 16:34:11 -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

Add @TransitionRes for transition resource integers

2015-03-13 11:19:21 -07:00

app

Merge "DPM constants for specifying minimum version numbers for DO and DIA."

2015-03-23 21:01:30 +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

Merge "Default ActivityInfo.resizeable to false for all SDK versions."

2015-03-23 22:00:01 +00: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

camera2: Remove ProCamera.

2015-03-20 22:38:54 -07:00

inputmethodservice

Add @ResourceInt annotations on APIs

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

net

Add a protectFromVpn method that takes a FileDescriptor

2015-03-20 16:32:40 +09:00

nfc

…

os

Merge "Bring MountService into the SystemService world."

2015-03-22 20:03:55 +00:00

preference

Add resource type annotations to some APIs

2015-03-13 11:20:45 -07:00

print

am e4bdf3c1: am be549f9b: Merge "Frameworks/base: Fix precedence bug"

2015-03-17 20:56:02 +00:00

printservice

Remove unused imports in frameworks/base.

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

provider

Merge "Check for empty lookup keys in getLookupUri"

2015-03-23 21:03:33 +00:00

security

am 2110a28a: am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."

2015-03-22 00:40:51 +00:00

service

Merge commit '583c7c56' into master

2015-03-23 16:34:11 -07:00

speech

Add resource type annotations to some APIs

2015-03-13 11:20:45 -07:00

test

…

text

Replace usages of deprecated Resources.getColor() and getColorStateList()

2015-03-18 18:37:18 -07:00

transition

Add @TransitionRes for transition resource integers

2015-03-13 11:19:21 -07:00

util

am c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |"

2015-03-17 20:47:41 +00:00

view

Merge commit '583c7c56' into master

2015-03-23 16:34:11 -07:00

webkit

Remove debug logging from WebView

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

widget

Docs nit

2015-03-23 14:54:35 -07:00

package.html

…