Craig Mautner 532f732838 resolved conflicts for merge of 5c4b5ede to lmp-dev-plus-aosp ...

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java

Change-Id: Id6ece6daa4a36dc8479f5bce867cce3b42b3ef70

2014-07-30 22:37:11 -07:00

..

accessibility

Improve the window query API performamce.

2014-07-25 01:17:02 +00:00

appwidget

…

backup

Make archive metadata idempotent

2014-07-29 21:06:29 +00:00

core

resolved conflicts for merge of 5c4b5ede to lmp-dev-plus-aosp

2014-07-30 22:37:11 -07:00

devicepolicy

Add new DevicePolicyManager API to allow fine-grained TrustAgent management

2014-07-28 21:32:01 -07:00

java/com/android/server

am 6a58309e: Merge "[ActivityManager] Prevent coredump file may not complete for testing."

2014-07-31 04:01:35 +00:00

print

…

restrictions

API Review: Improvements to RestrictionsManager API

2014-07-22 00:03:39 +00:00

tests

Remove dead code 2.

2014-07-28 14:48:52 -07:00

usage

Add Per-User logging of UsageStats

2014-07-25 17:18:54 +00:00

usb

…

voiceinteraction

Notify VIS of shutdown before switching implementations

2014-07-29 17:23:40 -07:00

Android.mk

…