OSDN Git Service

resolve merge conflicts of 1fae731 to nyc-mr1-dev-plus-aosp
-rw-r--r-- 292 .clang-format
-rw-r--r-- 32 .gitignore
-rw-r--r-- 17 Android.bp
-rw-r--r-- 81 Android.mk
-rw-r--r-- 75 CPPLINT.cfg
-rw-r--r-- 2682 CleanSpec.mk
-rw-r--r-- 10900 README.md
drwxr-xr-x - benchmarks
drwxr-xr-x - build
drwxr-xr-x - libc
drwxr-xr-x - libdl
drwxr-xr-x - libm
drwxr-xr-x - libstdc++
drwxr-xr-x - linker
drwxr-xr-x - tests
drwxr-xr-x - tools