Commit 2853e48c authored Mar 20, 2014 by Marco Nelissen Committed by Android Git Automerger Mar 20, 2014

am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80:...

am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '6f65db14':
  Verify certificates

parents 1faa4170 6f65db14

media/libstagefright/chromium_http/support.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,8 @@
		#include "net/proxy/proxy_config_service_android.h"

		#include "include/ChromiumHTTPDataSource.h"

		#include <arpa/inet.h>
		#include <binder/Parcel.h>
		#include <cutils/log.h>
		#include <media/stagefright/MediaErrors.h>
		#include <media/stagefright/Utils.h>