Christopher Tate 5e31fdbacd Merge "Adapt to underlying changes in the PBKDF2 implementation"

2014-01-29 21:42:58 +00: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

Adapt to underlying changes in the PBKDF2 implementation

2014-01-16 14:25:43 -08:00

core

am af17925f: am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"

2014-01-28 18:19:50 +00: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

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