OSDN Git Service

Merge "DefaultNetworkEvent metrics: rehaul" am: 69c9402a29
authorHugo Benichi <hugobenichi@google.com>
Mon, 6 Nov 2017 07:31:39 +0000 (07:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Nov 2017 07:31:39 +0000 (07:31 +0000)
am: d025358166

Change-Id: If6bf966ba547a2ce50e17340e0374dd9b75b80d9

1  2 
proto/src/ipconnectivity.proto
services/core/java/com/android/server/ConnectivityService.java

Simple merge