LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,611 Commits 2 Branches 0 Tags
d2348bc4d20d50b12e28f9c9f24f6fefdbd11608
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Hugo Benichi d2348bc4d2 resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp 
Conflits were:
  - static import section of ConnectivityService
  - code deleted in commit 94f0bfcda4

Test: built.
Change-Id: I0e026522558f39d8ae6812b62a30f2501923ab86
2017-04-20 22:26:50 +09:00
core
resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp
2017-04-20 22:26:50 +09:00
services
resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp
2017-04-20 22:26:50 +09:00
tests
Merge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f
2017-04-19 11:24:03 -07: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%