OSDN Git Service

resolve merge conflicts of d043a840f7f12ce2c54e7d4564a6ac9cfa24dd17 to nyc-mr2-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