Felipe Leme 18d6db9a68 resolve merge conflicts of a3d3da8 to nyc-mr1-dev-plus-aosp ...

am: 80f0d0f2a4

Change-Id: Ic5a8d119a95930feaf406bca83ee4a4f591675f8

2016-06-21 21:35:16 +00:00

..

accessibility

…

appwidget

Merge \"Allow stopping user to access AppWidgetService API\" into nyc-dev

2016-06-17 17:09:22 +00:00

backup

Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev

2016-06-20 17:19:55 +00:00

core

resolve merge conflicts of a3d3da8 to nyc-mr1-dev-plus-aosp

2016-06-21 21:35:16 +00:00

devicepolicy

More thorough cleansing of expired users

2016-06-15 11:32:16 -07:00

java/com/android/server

Merge \\\"More thorough cleansing of expired users\\\" into nyc-dev am: 4f2b1b455e am: bf1301f542

2016-06-16 00:38:28 +00:00

midi

…

net

…

print

Add event tracking to print UI.

2016-06-20 11:50:44 -07:00

restrictions

…

tests

Merge \\"Launcher shortcut callback should deliver manifest shortcuts too\\" into nyc-mr1-dev am: 901c03faba

2016-06-20 21:22:15 +00:00

usage

…

usb

UsbMidiDevice: Clean up terminology and fix comments

2016-06-17 08:04:28 -07:00

voiceinteraction

Prevent NPE when updating models without a vendor UUID

2016-06-14 15:53:14 -07:00

Android.mk

…