Narayan Kamath 62d35b65f2 resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp ...

Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a

2014-12-15 16:27:39 +00:00

..

res

Import translations. DO NOT MERGE

2014-10-30 11:46:41 -07:00

src/com/android/settings

Stop using apache-http in settings.

2014-12-12 14:22:06 +00:00

Android.mk

Add legacy VPN test framework and test cases

2014-04-01 17:45:58 -07:00

AndroidManifest.xml

Add legacy VPN test framework and test cases

2014-04-01 17:45:58 -07:00