OSDN Git Service

resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp
authorHugo Benichi <hugobenichi@google.com>
Thu, 20 Apr 2017 13:26:36 +0000 (22:26 +0900)
committerHugo Benichi <hugobenichi@google.com>
Thu, 20 Apr 2017 13:26:50 +0000 (22:26 +0900)
commit3ff96e5dd806f6ce608248f5698fbebdcec4f58c
tree074b9c46eff90014c22584ed110d92c1631b8b11
parent06c68a68ef568e2fc4d1f38969ff8a72ec232d4b
parent7bbd03be361f406a0c600b44e7b442e166090b50
resolve merge conflicts of 7bbd03be361f to oc-dev-plus-aosp

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

Test: built.
Change-Id: I0e026522558f39d8ae6812b62a30f2501923ab86
core/java/android/net/ConnectivityManager.java
services/core/java/com/android/server/ConnectivityService.java