OSDN Git Service

[automerger skipped]Merge "resolve merge conflicts of daef557352934e5a6e20a45bd2a01c8...
[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