OSDN Git Service

Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e
authorRemi NGUYEN VAN <reminv@google.com>
Thu, 29 Mar 2018 07:46:34 +0000 (07:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Mar 2018 07:46:34 +0000 (07:46 +0000)
commit62df0a68e007a244cdcd4d955393b6f6d03805f8
tree6425072839c8bba491da136b30731bc36b2277b5
parentc89999a995dde4a83d5f9fbbb1300ade95dc8b25
parentaa20932ff193945a3d49908bd00e6edae72d89b6
Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e
am: aa20932ff1

Change-Id: I016722f3a0ae2ae0a1d48bfacc4fe07ee3578ef7
core/java/android/net/NetworkStats.java
core/java/com/android/internal/net/NetworkStatsFactory.java
services/core/java/com/android/server/net/NetworkStatsService.java