Merge "Move TrafficStats tags for the network stack constants"

author Chalard Jean <jchalard@google.com>

Wed, 17 Apr 2019 05:45:56 +0000 (05:45 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 17 Apr 2019 05:45:56 +0000 (05:45 +0000)
author Chalard Jean <jchalard@google.com>
Wed, 17 Apr 2019 05:45:56 +0000 (05:45 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 17 Apr 2019 05:45:56 +0000 (05:45 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/net/TrafficStats.java
Simple merge
author	Chalard Jean <jchalard@google.com>
	Wed, 17 Apr 2019 05:45:56 +0000 (05:45 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 17 Apr 2019 05:45:56 +0000 (05:45 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/net/TrafficStats.java	patch \|	diff1 \|	diff2 \|	blob \| history