Christopher Tate 5e380f096c resolve merge conflicts of 7641889 to lmp-mr1-dev ...

am: cebcde3b5a

* commit 'cebcde3b5a1e406d953629d5b4c87347921a17de':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a

2016-04-20 00:05:54 +00:00

..

accessibility

Fix broken activation of the selected view in accessibility mode.

2015-02-02 23:17:17 +00:00

appwidget

DO NOT MERGE Don't take flags when creating app widget config activity.

2015-06-01 12:55:38 -07:00

backup

Don't run full-data backups when backup is disabled

2015-01-29 15:47:43 -08:00

core

resolve merge conflicts of 7641889 to lmp-mr1-dev

2016-04-20 00:05:54 +00:00

devicepolicy

Fix NPE if FPE service does not exist.

2015-03-25 11:43:42 +00:00

java/com/android/server

NPE fix for SyncStorageEngine read authority

2016-02-19 23:38:33 +00:00

print

…

restrictions

…

tests

Sync extras bundle comparison can throw NPE am: c0f39c1ece

2015-11-13 01:50:11 +00:00

usage

…

usb

…

voiceinteraction

…

Android.mk

…