Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e

author Remi NGUYEN VAN <reminv@google.com>

Thu, 29 Mar 2018 07:46:34 +0000 (07:46 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 29 Mar 2018 07:46:34 +0000 (07:46 +0000)
author Remi NGUYEN VAN <reminv@google.com>
Thu, 29 Mar 2018 07:46:34 +0000 (07:46 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 29 Mar 2018 07:46:34 +0000 (07:46 +0000)
diff --cc core/java/android/net/NetworkStats.java
Simple merge
diff --cc core/java/com/android/internal/net/NetworkStatsFactory.java
Simple merge
diff --cc services/core/java/com/android/server/net/NetworkStatsService.java
Simple merge
author	Remi NGUYEN VAN <reminv@google.com>
	Thu, 29 Mar 2018 07:46:34 +0000 (07:46 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 29 Mar 2018 07:46:34 +0000 (07:46 +0000)
		1	2
core/java/android/net/NetworkStats.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/com/android/internal/net/NetworkStatsFactory.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/net/NetworkStatsService.java	patch \|	diff1 \|	diff2 \|	blob \| history