OSDN Git Service

Merge changes Id8776d14,Ifa291c62,I5ea9d200 am: c48f4cb7f1 am: b36b423230
authorLorenzo Colitti <lorenzo@google.com>
Fri, 19 Jan 2018 16:46:11 +0000 (16:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Jan 2018 16:46:11 +0000 (16:46 +0000)
commit7f0087be4804a9f8fb1f5fb68036015918c3b37f
treed78fcbbb2befc0e0bde4e11c6bfb63f484248e5d
parent6f7734a64d72fe53baa811fbba6e7513857d92f9
parentcfbf873dd1099be5453ea9f0bbc0277e6a663257
Merge changes Id8776d14,Ifa291c62,I5ea9d200 am: c48f4cb7f1 am: b36b423230
am: cfbf873dd1

Change-Id: I12108d96e29bfe71406106c2af950a6d6a9f8351
core/java/com/android/internal/net/NetworkStatsFactory.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
tests/net/java/com/android/server/net/NetworkStatsCollectionTest.java
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java