OSDN Git Service

resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357...
[android-x86/frameworks-base.git] / tests / SurfaceComposition /
drwxr-xr-x   ..
-rw-r--r-- 1096 Android.mk
-rw-r--r-- 1596 AndroidManifest.xml
drwxr-xr-x - res
drwxr-xr-x - src