Chris Wren 95a079adf2 Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev am: cf665232f3 ...

am: b58e350e92

* commit 'b58e350e9266b8ced268b21900ab6c065dcac218':
  ShortcutManager: Implement max # of shortcuts

Change-Id: Ide9c5923c0dca42b5285ddcadda0716f2f00084b

2016-06-02 21:07:43 +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

Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev am: cf665232f3

2016-06-02 21:07:43 +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 "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032 am: a5e81480b1

2016-06-02 16:57:35 +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 "Give the auto-merger somthing to hang on to." into nyc-mr1-dev am: cf665232f3

2016-06-02 21:07:43 +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

…