Merge "DrmInitData: prevent public constructor access" into nyc-dev am: 696dc4d

author Robert Shih <robertshih@google.com>

Wed, 6 Apr 2016 17:23:27 +0000 (17:23 +0000)

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

Wed, 6 Apr 2016 17:23:27 +0000 (17:23 +0000)
author Robert Shih <robertshih@google.com>
Wed, 6 Apr 2016 17:23:27 +0000 (17:23 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 17:23:27 +0000 (17:23 +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	Robert Shih <robertshih@google.com>
	Wed, 6 Apr 2016 17:23:27 +0000 (17:23 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 6 Apr 2016 17:23:27 +0000 (17:23 +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