Chad Jones 1fb5528643 resolved conflicts for merge of 57bb5f5c to master ...

Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c

2015-02-23 21:19:58 -08:00

..

accessibilityservice

Fix broken activation of the selected view in accessibility mode.

2015-02-02 23:17:17 +00:00

accounts

New AccountManager method to copy accounts between users.

2014-11-14 11:09:27 +00:00

alsa

AlsaCardsParser: Ensure line is not NULL when reading Cards File.

2015-02-18 12:35:48 -08:00

animation

Add @ResourceInt annotations on APIs

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

annotation

…

app

Merge "Add MIDI Manager API tweaks:"

2015-02-23 23:03:36 +00:00

appwidget

Fix accessibility delegation

2015-01-07 16:05:02 -08:00

bluetooth

am cd623416: am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev

2015-02-10 00:50:06 +00:00

content

Add MIDI Manager API tweaks:

2015-02-23 14:32:23 -08: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

Add @ResourceInt annotations on APIs

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

hardware

Camera: codegen doc update

2015-02-20 15:52:06 -08:00

inputmethodservice

Add @ResourceInt annotations on APIs

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

net

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

2015-02-13 09:51:44 +00:00

nfc

am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"

2015-01-02 10:34:03 +00:00

os

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08:00

preference

Add some more @Nullable annotations

2015-02-22 20:43:56 -08:00

print

Add duplex mode support.

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

printservice

Fix breakages in update-api.

2015-02-06 13:14:41 +00:00

provider

Add PHONE_ACCOUNT_ADDRESS to the call log DB.

2015-02-19 23:43:12 -08:00

security

Add Keymaster 0.4 binder API

2015-02-23 14:12:37 -08:00

service

Add @ResourceInt annotations on APIs

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

speech

Add @ResourceInt annotations on APIs

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

test

…

text

Annotate the parameter in TextUtils#isEmpty() as @Nullable

2015-02-19 10:36:12 -08:00

transition

Increase visibility of Transition.areValuesChanged() to protected to allow

2015-02-12 15:27:57 -08:00

util

Add @ResourceInt annotations on APIs

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

view

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08:00

webkit

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

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

widget

Update progress bar and seek bar backgrounds, fix seek bar thumb

2015-02-23 12:49:47 -08:00

package.html

…