OSDN Git Service

[automerger skipped] resolve merge conflicts of 3afd4aed423d33680f9ef63f54592f6b7b1fa...
[android-x86/frameworks-base.git] / test-legacy /
drwxr-xr-x   ..
-rw-r--r-- 1177 Android.bp
-rw-r--r-- 2414 Android.mk