Dianne Hackborn dd5ee4b890 Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev

2015-05-23 00:34:35 +00:00

..

accessibility

…

appwidget

…

backup

Scan at boot time to detect newly-present full backup candidates

2015-05-21 01:32:39 +00:00

core

Revert "resolved conflicts for merge of 47249f2a to mnc-dev"

2015-05-22 16:34:44 -07:00

devicepolicy

Add getPermissionGrantState method in device policy

2015-05-22 13:55:57 -07:00

java/com/android/server

…

midi

…

net

…

print

…

restrictions

…

tests

…

usage

Use screen-on time and wallclock time for idleness calc

2015-05-20 15:40:37 -07:00

usb

Turning off logging in ALSA device connection routines.

2015-05-19 10:32:13 -07:00

voiceinteraction

am 782def77: am 80cf2210: Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.

2015-05-20 22:22:23 +00:00

Android.mk

…