diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-25 12:09:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 12:09:56 -0700 |
| commit | 4ece6db47ec33ed439ae2177fbc0cc3e7e79cdca (patch) | |
| tree | c1a59aec36c517ac1a124046ec3fac07ea3a53e3 /media | |
| parent | 1fae3cf246e109b7081bd199cf6a92065d008291 (diff) | |
| parent | 31d2cd2474013a9d7de5ca6ed3e888cf68592e28 (diff) | |
| download | frameworks_base-4ece6db47ec33ed439ae2177fbc0cc3e7e79cdca.zip frameworks_base-4ece6db47ec33ed439ae2177fbc0cc3e7e79cdca.tar.gz frameworks_base-4ece6db47ec33ed439ae2177fbc0cc3e7e79cdca.tar.bz2 | |
Merge "Merge chromium to 10.0.634.0: Compile fix"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/chromium_http/support.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/chromium_http/support.cpp b/media/libstagefright/chromium_http/support.cpp index 3e4e493..805bd48 100644 --- a/media/libstagefright/chromium_http/support.cpp +++ b/media/libstagefright/chromium_http/support.cpp @@ -23,7 +23,7 @@ #include "support.h" #include "android/net/android_network_library_impl.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/cert_verifier.h" #include "net/base/host_resolver.h" #include "net/base/ssl_config_service.h" |