Adrian Roos e3b07451c3 resolved conflicts for merge of bcc26c02 to master ...

Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388

2015-08-21 18:08:58 -07:00

..

java/com/android/server/devicepolicy

resolved conflicts for merge of bcc26c02 to master

2015-08-21 18:08:58 -07:00

Android.mk

Remove system_server classes from the boot image.

2014-08-15 13:37:03 +01:00