Hugo Benichi 3ff96e5dd8 resolve merge conflicts of 7bbd03be36 to oc-dev-plus-aosp ...

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

Test: built.
Change-Id: I0e026522558f39d8ae6812b62a30f2501923ab86

2017-04-20 22:26:50 +09:00

..

android

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

2017-04-20 22:26:50 +09:00

com

Merge "Add min and max learned battery capacity to batterystats." into oc-dev

2017-04-20 04:40:10 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…