Lorenzo Colitti 1142b2654a resolve merge conflicts of 51e4acb29d to nyc-dev ...

Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.

Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31

2016-02-24 15:19:15 +09:00

..

accessibility

Update accessibility to be encryption-aware.

2016-02-23 20:15:15 -07:00

appwidget

Don't load profile widgets until parent is unlocked.

2016-02-23 14:55:01 +00:00

backup

Add android:backupInForeground

2016-02-18 20:47:36 +00:00

core

resolve merge conflicts of 51e4acb29d to nyc-dev

2016-02-24 15:19:15 +09:00

devicepolicy

Remove deprecated APIs DPM.createUser, createAndInitializeUser

2016-02-22 14:04:14 +01:00

java/com/android/server

resolve merge conflicts of 51e4acb29d to nyc-dev

2016-02-24 15:19:15 +09:00

midi

…

net

Add WaitForProvisioningCallback

2016-02-22 04:29:37 +00:00

print

Check parameters for callers of IPrintManager

2016-01-21 13:27:30 -08:00

restrictions

…

tests

Limit scheduled jobs to 100 per app

2016-02-22 12:42:29 -08:00

usage

Reduce locking duration when checking idle states

2016-02-18 11:22:30 -08:00

usb

Open MTP device on demand.

2016-02-04 12:45:58 +09:00

voiceinteraction

Unload logic for generic and keyphrase sound models.

2016-02-22 15:19:44 -08:00

Android.mk

…