Nick Kralevich d5c8044e7e resolved conflicts for merge of 1cbea39f to master ...

Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700

2014-02-12 14:41:25 -08:00

..

accessibility

am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev

2014-02-06 20:25:51 +00:00

appwidget

am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

2014-02-11 08:33:50 +00:00

backup

Fix build.

2014-02-11 09:40:19 +00:00

core

resolved conflicts for merge of 1cbea39f to master

2014-02-12 14:41:25 -08:00

devicepolicy

am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

2014-02-11 08:33:50 +00:00

java/com/android/server

Merge "Runtime resource overlay, iteration 2"

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

print

am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

2014-02-11 08:33:50 +00:00

tests

Extend DeviceOwner concept to accommodate ProfileOwners

2014-02-06 10:07:19 +00:00

Android.mk

Check feature bits before loading optional services

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