Craig Mautner b859449b71 resolved conflicts for merge of 88bfc6dd to master ...

Change-Id: Ib656ac0591b21ad14f2df51021729552e9373515

2014-01-08 09:51:33 -08:00

..

accessibility/java

Merge "Move files to new directory structure of framework services"

2013-12-19 23:32:03 +00:00

appwidget/java

Merge commit '817ec49e' into manualmerge

2013-12-20 16:36:48 -08:00

backup/java

Merge commit '817ec49e' into manualmerge

2013-12-20 16:36:48 -08:00

core

resolved conflicts for merge of 88bfc6dd to master

2014-01-08 09:51:33 -08:00

devicepolicy/java

Merge commit '817ec49e' into manualmerge

2013-12-20 16:36:48 -08:00

print/java

Merge commit '817ec49e' into manualmerge

2013-12-20 16:36:48 -08:00

tests/servicestests

am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."

2013-12-09 18:34:44 +00:00

Android.mk

Wrap some services into a SystemService

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