Amith Yamasani b8ab1d3b12 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp ...

Change-Id: Id4b3de71842eedd49684b367ed993f44f2f91970

2016-06-08 11:50:57 -07: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 c33507d to nyc-mr1-dev-plus-aosp

2016-06-08 11:50:57 -07: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

2016-06-02 16:41:12 +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: deal with changing resource IDs on app update" into nyc-mr1-dev

2016-06-08 17:00:00 +00:00

usage

ShortcutManager: Implement usage report API

2016-06-02 15:57:40 -07:00

usb

Handle the uncommon case that a name is null

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

voiceinteraction

Properly set default voice interactor

2016-06-02 15:25:15 -07:00

Android.mk

…