Svetoslav Ganov 692ea60d9c Merge "UID appop state should always override package appop" into nyc-dev ...

am: 6c773c5

* commit '6c773c5daad75e58a4b4312b4d73c722d9500bb4':
  UID appop state should always override package appop

Change-Id: Iab38726048f51ae02ac13af42f9906826e0721d4

2016-04-05 23:25:08 +00:00

..

accessibility

Merge "Fix bug where service disabled with disableSelf() would not reset soft keyboard behavior. Bug: 27947344" into nyc-dev

2016-04-04 19:19:32 +00:00

appwidget

Merge "Changing startListening to only fetch views which are bound" into nyc-dev

2016-04-05 18:53:18 +00:00

backup

Merge "Extract signature related utilities" into nyc-dev

2016-03-29 19:25:49 +00:00

core

Merge "UID appop state should always override package appop" into nyc-dev

2016-04-05 23:25:08 +00:00

devicepolicy

Merge "getProfiles should only returns non-partial user info" into nyc-dev

2016-04-05 17:24:30 +00:00

java/com/android/server

Invalidate caches when locale changes.

2016-04-04 16:46:01 -06:00

midi

…

net

Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev

2016-04-05 13:35:09 +00:00

print

Add the print service recommendation service

2016-03-30 17:21:07 -07:00

restrictions

…

tests

ShortcutManager: More command for CTS, more tests..

2016-04-04 11:02:06 -07:00

usage

…

usb

UsbMidiDevice: fix MIDI flush()

2016-04-05 11:30:00 -07:00

voiceinteraction

…

Android.mk

…