Andrew Scull 8203155664 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 ...

am: 3c9b36482f

Change-Id: I2eb73ac546ce8be144ec96fcac573caa2c5e8a13

2017-01-13 21:23:27 +00:00

..

accessibility

Add null check to a11y interrupt.

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

appwidget

Preventing widgets from exceeding Bitmap memory limit

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

backup

Merge "Fix the deadlock problem"

2016-12-02 22:45:47 +00:00

core

resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1

2017-01-13 21:23:27 +00:00

devicepolicy

resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969

2017-01-13 21:16:31 +00:00

java/com/android/server

Fix exploit where can hide the fact that a location was mocked

2016-12-15 10:26:28 -08:00

midi

…

net

Don't loop forever on zero-length ICMPv6 ND options.

2016-12-23 08:26:29 +00:00

print

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

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

restrictions

…

retaildemo

Add support for carrier demo mode

2017-01-13 09:26:58 -08:00

tests

Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43

2017-01-12 05:11:47 +00:00

usage

…

usb

Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers.

2016-12-12 11:05:32 -08:00

voiceinteraction

Only purge sound models that violate the new primary key constraint if

2016-10-18 15:36:27 -07:00

Android.mk

…