Todd Kennedy 3b91bd2173 resolved conflicts for 7de7e0b0 to stage-aosp-master ...

(cherry picked from commit 9f86026444)

Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30

2015-11-16 10:43:53 -08:00

..

accessibility

…

appwidget

Always call onProvidersChanged() when packages containing widgets are updated.

2015-08-11 14:29:13 -07:00

backup

Crashing the system process is inadvisable

2015-08-28 10:59:25 -07:00

core

resolved conflicts for 7de7e0b0 to stage-aosp-master

2015-11-16 10:43:53 -08:00

devicepolicy

Add StrongAuthTracker

2015-08-21 13:28:00 -07:00

java/com/android/server

Add ThermalObserver system service to capture thermal state uevents.

2015-09-25 16:43:01 -07:00

midi

BLE-MIDI: change binding for BluetoothMidiService

2015-10-13 15:40:03 +00:00

net

Don't crash if a DHCP server doesn't send the server ID option.

2015-10-29 16:09:16 +09:00

print

…

restrictions

…

tests

DO NOT MERGE Sync extras bundle comparison can throw NPE

2015-10-20 18:55:30 +00:00

usage

DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files

2015-11-11 17:39:37 -08:00

usb

UsbDeviceManager: set mUsbDataUnlocked=false on user switch

2015-10-29 21:30:59 +00:00

voiceinteraction

Merge "Don't call StopRecognition when recognition was aborted." into mnc-dr-dev

2015-10-15 01:24:45 +00:00

Android.mk

…