Hugo Benichi b8a9892344 resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp ...

am: 524b2e4f30

Change-Id: Ia0a4544784592ac857e5bd652fee47eec621f3a0

2016-07-26 15:18:51 +00:00

..

accessibility

Merge "Add tests for accessibility motion event injector."

2016-07-20 16:45:47 +00:00

appwidget

Merge \\"Guard against null object in scheduleNotifyUpdateAppWidgetLocked\\" into nyc-mr1-dev am: 26504a611a

2016-07-12 17:01:30 +00:00

backup

Merge "Turn down restore-time logspam" into nyc-mr1-dev

2016-07-15 18:05:07 +00:00

core

resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp

2016-07-26 15:18:51 +00:00

devicepolicy

Persist master volume mute across reboot am: c1205111a9

2016-07-25 10:45:02 +00:00

java/com/android/server

Added foundation for supporting unit tests in WindowManager

2016-07-18 18:47:00 -07:00

midi

…

net

More correctly close RA daemon socket.

2016-07-19 22:44:21 +09:00

print

…

restrictions

…

retaildemo

Merge "Allow calling in demo mode" into nyc-mr1-dev

2016-07-21 00:21:13 +00:00

tests

Fix intent flags am: 7e5c3e8542

2016-07-22 20:52:49 +00:00

usage

Whitelisting device provisioning package from app standby

2016-07-15 03:41:41 +00:00

usb

Handle USB power role \\'sink\\' am: 0135516153

2016-07-26 15:07:50 +00:00

voiceinteraction

SoundTriggerHelpoer: Send pause events on abort if a model is running.

2016-07-20 14:43:07 -07:00

Android.mk

…