OSDN Git Service

resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp
authorLorenzo Colitti <lorenzo@google.com>
Fri, 14 Apr 2017 02:37:12 +0000 (11:37 +0900)
committerLorenzo Colitti <lorenzo@google.com>
Fri, 14 Apr 2017 02:37:12 +0000 (11:37 +0900)
commitd6af00f5e4747b58794abb94a5b0c210c8c98795
tree9662b0284c54fd3673e9193661b90b1ee76cce94
parent054a99d029da9c2635f747dfd5560a929e270ad8
parent4db137b0599a9dfff8a26cb5c2b6dab71b457a9b
resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp

Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91
core/java/android/net/NetworkCapabilities.java
services/core/java/com/android/server/connectivity/NetworkMonitor.java