Merge "Add nullability annotations" am: a1ee1fc888 am: 3d48153a8f

author Remi NGUYEN VAN <reminv@google.com>

Mon, 25 Mar 2019 13:56:43 +0000 (06:56 -0700)

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

Mon, 25 Mar 2019 13:56:43 +0000 (06:56 -0700)
author Remi NGUYEN VAN <reminv@google.com>
Mon, 25 Mar 2019 13:56:43 +0000 (06:56 -0700)
committer android-build-merger <android-build-merger@google.com>
Mon, 25 Mar 2019 13:56:43 +0000 (06:56 -0700)
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/net/StaticIpConfiguration.java
Simple merge
diff --cc core/java/android/net/metrics/ValidationProbeEvent.java
Simple merge
author	Remi NGUYEN VAN <reminv@google.com>
	Mon, 25 Mar 2019 13:56:43 +0000 (06:56 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 25 Mar 2019 13:56:43 +0000 (06:56 -0700)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/net/StaticIpConfiguration.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/net/metrics/ValidationProbeEvent.java	patch \|	diff1 \|	diff2 \|	blob \| history