Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff...

author Sergio Giro <sgiro@google.com>

Wed, 31 Aug 2016 08:37:24 +0000 (08:37 +0000)

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

Wed, 31 Aug 2016 08:37:24 +0000 (08:37 +0000)
author Sergio Giro <sgiro@google.com>
Wed, 31 Aug 2016 08:37:24 +0000 (08:37 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 31 Aug 2016 08:37:24 +0000 (08:37 +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	Sergio Giro <sgiro@google.com>
	Wed, 31 Aug 2016 08:37:24 +0000 (08:37 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 31 Aug 2016 08:37:24 +0000 (08:37 +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