OSDN Git Service

resolved conflicts for merge of 534f3e94 to jb-mr1-dev
[android-x86/frameworks-base.git] / keystore /
drwxr-xr-x   ..
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10690 NOTICE
drwxr-xr-x - java
drwxr-xr-x - tests