Marie Janssen 6727859f42 resolve merge conflicts of 825d8ff to master ...

Change-Id: I57ae47778f738dbea6a670b85f24161cfb544a16

2016-12-29 16:20:43 -08:00

..

accessibility

Always propagate AccessibilityCache events

2016-12-29 13:05:58 -08: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 825d8ff to master

2016-12-29 16:20:43 -08:00

devicepolicy

Merge "Add DISALLOW_ADD_MANAGED_PROFILE to existing device owners"

2016-12-22 10:29:31 +00:00

java/com/android/server

First checkin of incident reporting.

2016-12-15 11:23:05 -08:00

midi

…

net

Don't loop forever on zero-length ICMPv6 ND options. am: 2f157c421a

2016-12-23 08:32:03 +00:00

print

Ignore commands if service connection is destroyed.

2016-12-15 10:53:02 -08:00

restrictions

…

retaildemo

Update usage of ActivityManagerNative.

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

tests

Merge changes I2ac2cdba,I6ade7874

2016-12-28 20:41:34 +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

…