Esteban Talavera 5fcad0a6b0 resolved conflicts for merge of 82b53329 to master ...

Change-Id: Icfdf1a9b563560ca7998f9f9d403df33eff94a46

2014-09-03 19:57:35 +01:00

..

java/com/android/server/devicepolicy

resolved conflicts for merge of 82b53329 to master

2014-09-03 19:57:35 +01:00

Android.mk

Remove system_server classes from the boot image.

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