Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1...

author Lorenzo Colitti <lorenzo@google.com>

Wed, 12 Apr 2017 23:45:57 +0000 (23:45 +0000)

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

Wed, 12 Apr 2017 23:45:57 +0000 (23:45 +0000)
author Lorenzo Colitti <lorenzo@google.com>
Wed, 12 Apr 2017 23:45:57 +0000 (23:45 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 23:45:57 +0000 (23:45 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Lorenzo Colitti <lorenzo@google.com>
	Wed, 12 Apr 2017 23:45:57 +0000 (23:45 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 12 Apr 2017 23:45:57 +0000 (23:45 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history