Vladislav Kuzkokov 543befb7c2 resolve merge conflicts of 792e051 to master ...

Change-Id: I75e604639959df77ddf11bbb9805392e4141da23

2016-10-13 13:49:13 +02:00

..

accessibility

Move a11y event dispatch back to ui thread.

2016-10-05 11:08:20 -07:00

appwidget

…

backup

Respect restoreAnyVersion=true in full-data restore path

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

core

DO NOT MERGE: Ambient light sensor changes for doze mode.

2016-10-13 07:53:55 +00:00

devicepolicy

resolve merge conflicts of 792e051 to master

2016-10-13 13:49:13 +02:00

java/com/android/server

Linear blending, step 1

2016-10-11 17:47:58 -07:00

midi

…

net

ApfFilter: systematically use u8, u16, u32 getters

2016-10-13 10:16:31 +09:00

print

Do not enforce unlocked state for system calls

2016-10-06 14:22:11 -07:00

restrictions

…

retaildemo

Don't limit RetailDemoModeService to start only during demo mode.

2016-09-30 10:29:26 -07:00

tests

Switch WindowState to get display content from its window token

2016-10-12 15:49:13 +00:00

usage

Handle charging state separately from temporary parole

2016-09-15 13:38:43 -07:00

usb

Clear USB device defaults when user is removed

2016-10-11 10:10:53 -07:00

voiceinteraction

…

Android.mk

…