OSDN Git Service

resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c
[android-x86/frameworks-base.git] / proto /
drwxr-xr-x   ..
-rw-r--r-- 436 Android.mk
-rw-r--r-- 73 jarjar-rules.txt
drwxr-xr-x - src