Hui Lu 945d69d7b8 am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev ...

* commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
  Add proxy as another network.

2014-01-31 08:11:57 +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 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev

2014-01-31 08:11:57 +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