joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity
No description. Add one?
3,611 commits 1 branch 0 tags 204 MiB
  • Java 78%
  • Kotlin 11.8%
  • AIDL 4.4%
  • C++ 3.7%
  • C 1.5%
  • Other 0.5%
Find a file
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Hugo Benichi 981ee3f2c3 resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp 
Conflits were:
  - static import section of ConnectivityService
  - code deleted in commit 8d96292e08

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