Joel Scherpelz a084e3283f Merge "Partially revert "Add blocking and retrying wrappers for INetd uses."" ...

am: 8b560611bf

Change-Id: I65e9137ae4c4f48e5484059244833edeab41f001

2017-03-31 00:42:57 +00:00

..

accessibility

Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"

2017-03-14 19:07:22 +00:00

appwidget

Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates.

2017-01-18 01:51:31 +00:00

backup

Merge "Fix the deadlock problem"

2016-12-02 22:45:47 +00:00

core

Merge "Move some VPN logic out of ConnectivityService"

2017-03-30 16:08:50 +00:00

devicepolicy

Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 am: f85a20702a

2017-02-10 12:32:48 +00:00

java/com/android/server

Merge commit 'ce073d70bedc' into stage-aosp-master

2017-03-29 16:04:31 -07:00

midi

…

net

Merge "Partially revert "Add blocking and retrying wrappers for INetd uses.""

2017-03-31 00:42:57 +00:00

print

Move dump() to dumpAsync(), more oneway calls.

2016-12-07 12:24:21 -08:00

restrictions

…

retaildemo

Enable SMS in carrier demo mode

2017-01-31 19:40:40 -08:00

tests

Merge changes from topic 'dex'

2017-03-29 01:27:37 +00:00

usage

…

usb

Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function"

2017-03-28 18:57:16 +00:00

voiceinteraction

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

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

Android.mk

…