Lorenzo Colitti d6af00f5e4 resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp ...

Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91

2017-04-14 11:37:12 +09:00

..

accessibility

Merge "clear calling identity before calling settings provider" into oc-dev

2017-04-12 22:09:24 +00:00

appwidget

Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev

2017-04-05 17:37:15 +00:00

autofill

Fill UI polish

2017-04-12 09:53:13 -07:00

backup

Removed unused variables in PerformBackupTask#finalizeBackup()

2017-04-07 11:08:27 +01:00

core

resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp

2017-04-14 11:37:12 +09:00

coverage

…

devicepolicy

Merge "Persistent connection to DO/PO service." into oc-dev

2017-04-03 20:35:18 +00:00

java/com/android/server

Merge "Add autofill feature API" into oc-dev

2017-04-12 21:17:33 +00:00

midi

Consistent dump() permission checking.

2017-04-02 22:29:07 -06:00

net

Tethering: support Local-only Hotspot mode for downstreams

2017-04-10 21:42:16 +09:00

print

Add ICompanionDeviceManager.getAssociation overload with explicit userId

2017-04-07 17:51:52 +00:00

restrictions

…

retaildemo

standardize system notification IDs

2017-03-31 11:44:05 -04:00

tests

Merge "Remove window container from empty task when destroying." into oc-dev

2017-04-13 20:10:56 +00:00

usage

Fix crash when measuring storage.

2017-04-06 14:32:13 -07:00

usb

Merge "Reset the default usb package less often" into oc-dev

2017-04-12 00:12:15 +00:00

voiceinteraction

Fix the issue of voice interactor getting reset after reboot.

2017-04-10 15:32:52 -07:00

Android.mk

…

profile-classes

Reorganize font enumeration API.

2017-04-03 13:55:07 -07:00