OSDN Git Service

Merge "Add tracing for network statistics and policy." into pi-dev
authorJeff Sharkey <jsharkey@android.com>
Tue, 17 Apr 2018 01:10:40 +0000 (18:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Apr 2018 01:10:40 +0000 (18:10 -0700)
commita9d84bcf2765ac6184b2d87160d04a00eb115d63
tree8acb3eb101663c6a48c88bccfb493303a207b2ce
parent7b913d70b9aa2ba88f2da690678d6bd5bd4e8448
parentc359f490457d491de9d53aee0091cc4f3c43ae83
Merge "Add tracing for network statistics and policy." into pi-dev
am: c359f49045

Change-Id: I2b6634c8df4dfe14fb4cd01bca6611e7cf7a0056
services/core/java/com/android/server/net/NetworkStatsService.java