Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am: 28dab313...

author Christopher Tate <ctate@google.com>

Fri, 14 Apr 2017 19:19:19 +0000 (19:19 +0000)

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

Fri, 14 Apr 2017 19:19:19 +0000 (19:19 +0000)
author Christopher Tate <ctate@google.com>
Fri, 14 Apr 2017 19:19:19 +0000 (19:19 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 19:19:19 +0000 (19:19 +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	Christopher Tate <ctate@google.com>
	Fri, 14 Apr 2017 19:19:19 +0000 (19:19 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 14 Apr 2017 19:19:19 +0000 (19:19 +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