diff options
author | Marco Nelissen <marcone@google.com> | 2014-03-20 19:09:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 19:09:03 +0000 |
commit | fb08bd765844160649f23c0e5ee76772678528ba (patch) | |
tree | 8b5d004f1aa36430c5b3c7c3d5cc1e5c7d53a15b /media/libstagefright | |
parent | c250980f65ffec76537d9c6d9b1ad12afc38346a (diff) | |
parent | 994cbef7361b0f304883ea463488342347ed67b8 (diff) | |
download | frameworks_av-fb08bd765844160649f23c0e5ee76772678528ba.zip frameworks_av-fb08bd765844160649f23c0e5ee76772678528ba.tar.gz frameworks_av-fb08bd765844160649f23c0e5ee76772678528ba.tar.bz2 |
am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates
* commit '994cbef7361b0f304883ea463488342347ed67b8':
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> |