Chris Wren 3a716c735b resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01 ...

am: be2da62d11

* commit 'be2da62d11227c564817906c5df0ceb151ed2436':
  make the notification enqueue rate threshold a setting

Change-Id: I499087166d900cfbd4675e54382117c530e0e3ed

2016-06-02 16:48:13 +00:00

..

accessibility

Ensure MotionEvent.split() won't be given an invalid value.

2016-05-25 12:38:58 -07:00

appwidget

Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev

2016-05-25 20:45:44 +00:00

backup

Use backstop timeouts on asynchronous countdown during preflight

2016-05-25 18:13:30 -07:00

core

resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01

2016-06-02 16:48:13 +00:00

devicepolicy

Do not get device owner admin info when device owner is null

2016-05-31 18:01:46 +01:00

java/com/android/server

Merge "Disable WiFi p2p service if it's not supported."

2016-06-01 20:38:15 +00:00

midi

…

net

Merge "Don't drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev

2016-05-27 14:58:48 +00:00

print

…

restrictions

…

tests

Merge "ShortcutManager: API rename" into nyc-mr1-dev am: 60585d12e7

2016-06-02 00:50:25 +00:00

usage

…

usb

Handle the uncommon case that a name is null

2016-05-31 10:16:30 -07:00

voiceinteraction

Use correct synchronization lock

2016-05-23 17:21:08 -07:00

Android.mk

…