Marie Janssen 5c7ef9ccc7 resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp am: f2fc15824d ...

am: 2f94877c01

Change-Id: I00f1e604816bd95b4ecc3063209e38780a4e8675

2016-12-15 00:27:08 +00:00

..

accessibility

Merge "Add null check to a11y interrupt."

2016-12-14 18:49:30 +00:00

appwidget

Preventing widgets from exceeding Bitmap memory limit

2016-12-07 19:20:02 +00:00

autofill

AutoFill Framework refactoring.

2016-12-12 18:22:45 -08:00

backup

Merge "Fix the deadlock problem" am: fa228e06f6 am: e8c0e1098e am: 35b99da33a

2016-12-02 23:02:58 +00:00

core

resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp am: f2fc15824d

2016-12-15 00:27:08 +00:00

devicepolicy

Create DISALLOW_{ADD,REMOVE}_MANAGED_PROFILE user restrictions

2016-12-13 18:14:19 +00:00

java/com/android/server

init.start was renamed to ro.boottime.init

2016-12-12 12:41:31 -08:00

midi

…

net

More correct startup and shutdown procedures. am: 6c0782f1ae

2016-12-14 11:46:26 +00:00

print

Move dump() to dumpAsync(), more oneway calls.

2016-12-07 12:24:21 -08:00

restrictions

…

retaildemo

Update usage of ActivityManagerNative.

2016-11-14 11:27:12 -08:00

tests

Merge "Create DISALLOW_{ADD,REMOVE}_MANAGED_PROFILE user restrictions"

2016-12-14 19:16:26 +00:00

usage

Merge "Add Sharing Histories to UsageStatsManager."

2016-12-14 19:26:34 +00:00

usb

Merge "Exit accessory mode more aggressively"

2016-12-14 22:29:39 +00:00

voiceinteraction

Update usage of ActivityManagerNative.

2016-11-14 11:27:12 -08:00

Android.mk

Initial implementation of the Auto-Fill Framework classes.

2016-11-08 14:40:56 -08:00