Narayan Kamath dfd1aa4331 resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp ...

Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2

2014-01-31 12:57:24 +00:00

..

accessibility/java

Move some system services to separate directories

2013-12-19 15:25:37 -08:00

appwidget/java

Wrap some services into a SystemService

2013-12-20 14:46:56 -08:00

backup/java

Wrap some services into a SystemService

2013-12-20 14:46:56 -08:00

core

resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp

2014-01-31 12:57:24 +00:00

devicepolicy/java

Wrap some services into a SystemService

2013-12-20 14:46:56 -08:00

print/java

Wrap some services into a SystemService

2013-12-20 14:46:56 -08:00

tests

Include subdirectory Android.mks.

2014-01-09 20:41:57 +00:00

Android.mk

Only compile the services jar and so when using mmm

2014-01-09 15:38:12 -08:00