OSDN Git Service

resolved conflicts for merge of 534f3e94 to jb-mr1-dev
[android-x86/frameworks-base.git] / tests / SslLoad /
drwxr-xr-x   ..
-rw-r--r-- 185 Android.mk
-rw-r--r-- 547 AndroidManifest.xml
drwxr-xr-x - src