Jim Miller 33a5c80773 resolved conflicts for merge of 448216e7 to mnc-dr-dev ...

Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5

2015-08-18 13:07:25 -07:00

..

accessibility

Add accessibility event for assist disclosure

2015-06-30 00:27:14 +00:00

appwidget

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

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

backup

Clean up properly if outcall for doRestoreFinished() fails

2015-08-17 12:16:19 -07:00

core

resolved conflicts for merge of 448216e7 to mnc-dr-dev

2015-08-18 13:07:25 -07:00

devicepolicy

Merge "Change MNC codename to just M." into mnc-dev

2015-07-31 17:11:58 +00:00

java/com/android/server

am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.

2015-08-12 10:39:13 +00:00

midi

…

net

am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev

2015-08-12 03:45:30 +00:00

print

…

restrictions

…

tests

resolved conflicts for merge of dbc4edcc to mnc-dr-dev

2015-08-05 07:07:24 -04:00

usage

Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

2015-08-18 11:08:10 -07:00

usb

Merge "Use init to write usb typec props." into mnc-dr-dev

2015-08-18 19:54:46 +00:00

voiceinteraction

add metrics to assistant

2015-08-06 15:11:42 -04:00

Android.mk

…