Wei Liu 8e4799ad45 resolved conflicts for merge of f0c4f0dd to mnc-dev ...

Change-Id: I16df088016c010aa25ee73ea8e68b3db8c0449e3

2015-05-13 09:57:33 -07:00

..

accessibility

Update use of procstate for services.

2015-04-29 17:04:50 -07:00

appwidget

Exclude bound app widgets from idle app list

2015-05-01 11:17:27 -07:00

backup

Fix requestRestore() of an app's own package

2015-05-06 12:31:46 -07:00

core

resolved conflicts for merge of f0c4f0dd to mnc-dev

2015-05-13 09:57:33 -07:00

devicepolicy

Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev

2015-05-12 09:06:14 +00:00

java/com/android/server

Improve keying for theme caches, rebase system theme on config change

2015-05-06 10:41:43 -07:00

midi

MidiManager: Address API Council feedback:

2015-05-12 13:39:56 -07:00

net

Merge commit '4cb5d80' into merge2

2015-04-24 14:03:28 -07:00

print

Update use of procstate for services.

2015-04-29 17:04:50 -07:00

restrictions

…

tests

Fix PackageManagerSettingsTests and add KeySet info.

2015-04-28 15:06:23 -07:00

usage

Allow exemption to idle apps at periodic intervals

2015-05-12 16:08:50 -07:00

usb

UsbManager / UsbService / UsbDeviceManager: delete unused code

2015-05-10 21:57:56 -07:00

voiceinteraction

Fixed a bug with svelte and voice assist

2015-05-08 01:21:38 +00:00

Android.mk

…