Marie Janssen 635d528877 resolve merge conflicts of 6a31a5c to stage-aosp-master ...

am: 879a5169ec

Change-Id: Ib6321dee7357920c73b135fbe465998dc4469e66

2016-10-31 18:47:52 +00:00

..

accessibility

…

appwidget

…

backup

Respect restoreAnyVersion=true in full-data restore path

2016-10-11 15:29:39 -07:00

core

resolve merge conflicts of 6a31a5c to stage-aosp-master

2016-10-31 18:47:52 +00:00

devicepolicy

Don't expose default strong auth timeout as constant

2016-10-13 22:52:38 +00:00

java/com/android/server

DO NOT MERGE - Added Emergency affordance feature

2016-10-10 18:58:23 +00:00

midi

…

net

Reject DHCP packets with no magic cookie

2016-10-07 02:29:49 +00:00

print

…

restrictions

…

retaildemo

Enabling wifi on new demo session

2016-09-23 14:14:41 -07:00

tests

Extending DNS event reporting

2016-10-27 17:28:15 +00:00

usage

…

usb

…

voiceinteraction

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

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

Android.mk

…