Skip to content
Commit 3ff96e5d authored by Hugo Benichi's avatar Hugo Benichi
Browse files

resolve merge conflicts of 7bbd03be to oc-dev-plus-aosp 

Conflits were:
  - static import section of ConnectivityService
  - code deleted in commit a0385686

Test: built.
Change-Id: I0e026522558f39d8ae6812b62a30f2501923ab86
parents 06c68a68 7bbd03be
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment