OSDN Git Service

resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master
authorHugo Benichi <hugobenichi@google.com>
Thu, 13 Jul 2017 22:25:51 +0000 (07:25 +0900)
committerHugo Benichi <hugobenichi@google.com>
Thu, 13 Jul 2017 22:25:51 +0000 (07:25 +0900)
commita428392c1ddb93cabf0186ea0507b1fbc5254c60
treebf4c6024d1456f06da1849be5639c14d61c785bf
parent791a698a6a5f6c6e8b37f43c38f0027af9ee70be
parent4f2a0fe213e56d1eb4221a02a09571262ef8036a
resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031
core/java/android/net/metrics/IpManagerEvent.java
services/net/java/android/net/ip/IpManager.java