Nick Kralevich dd3d95f182 resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp ...

Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0

2014-02-12 11:05:59 -08:00

..

accessibility

Check feature bits before loading optional services

2014-02-05 19:26:40 +00:00

appwidget

Make SystemService constructor take a Context.

2014-02-10 20:01:43 -08:00

backup

Make SystemService constructor take a Context.

2014-02-10 20:01:43 -08:00

core

resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp

2014-02-12 11:05:59 -08:00

devicepolicy

Make SystemService constructor take a Context.

2014-02-10 20:01:43 -08:00

java/com/android/server

Merge "Runtime resource overlay, iteration 2"

2014-02-11 21:29:58 +00:00

print

Make SystemService constructor take a Context.

2014-02-10 20:01:43 -08:00

tests

Include subdirectory Android.mks.

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

Android.mk

Check feature bits before loading optional services

2014-02-05 19:26:40 +00:00