LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,561 Commits 2 Branches 0 Tags
2f8889613dd50494b1c6152190c6aa14358eda4b
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Chalard Jean 2f8889613d Resolve merge conflicts of aedd67b6cc to master 
Test: this is the exact code these changes were meant to give
      without conflict had the auto-merger not squashed them
      together before it tried to merge them. It was tested on
      master in this state.

Change-Id: I5cbde17fb6016e5e6b5d0b04c8f41858d708ef4a
2018-01-24 15:59:26 +09:00
core
Resolve merge conflicts of aedd67b6cc to master
2018-01-24 15:59:26 +09:00
services
Resolve merge conflicts of aedd67b6cc to master
2018-01-24 15:59:26 +09:00
tests/net
Resolve merge conflicts of aedd67b6cc to master
2018-01-24 15:59:26 +09:00
Description
android_packages_modules_Connectivity
189 MiB
Languages
Java 81.4%
Kotlin 7.7%
AIDL 4.5%
C++ 4.5%
C 1.7%
Other 0.1%