diff options
author | Marco Nelissen <marcone@google.com> | 2014-03-20 18:59:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 18:59:48 +0000 |
commit | 762108211026d46cf277d1585cf770170932e3f2 (patch) | |
tree | d952bd8aa8f6c8e5a20dcbfafc667dfb7a65079b /media/libstagefright | |
parent | 181cd2ba90ab574da7b57a0b79e3e2118b6ea3ad (diff) | |
parent | 2853e48c855fc95f2bd7bf9438a878f2a79d75a7 (diff) | |
download | frameworks_av-762108211026d46cf277d1585cf770170932e3f2.zip frameworks_av-762108211026d46cf277d1585cf770170932e3f2.tar.gz frameworks_av-762108211026d46cf277d1585cf770170932e3f2.tar.bz2 |
am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates
* commit '2853e48c855fc95f2bd7bf9438a878f2a79d75a7':
Verify certificates
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/chromium_http/support.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/chromium_http/support.cpp b/media/libstagefright/chromium_http/support.cpp index d4e82ee..3de4877 100644 --- a/media/libstagefright/chromium_http/support.cpp +++ b/media/libstagefright/chromium_http/support.cpp @@ -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> |