Narayan Kamath 0051514845 resolved conflicts for merge of 396b9e79 to master ...

Change-Id: Ie71a79699be57f5af6069559068bf6253835d805

2014-02-13 11:48:48 +00: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 396b9e79 to master

2014-02-13 11:48:48 +00: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 "Telephony API extension v2"

2014-02-13 04:26:33 +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