diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-25 11:49:55 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 11:50:00 +0100 |
| commit | a533975a8e3bb741948750a68a2c962a48777fe0 (patch) | |
| tree | b56406b6f9d3e4c7cda66aa7f1cb2fc17efa0f81 /media/libstagefright/chromium_http | |
| parent | 162f7d15ac5c8c23d1c3de171239f3a4e6e06b2a (diff) | |
| download | frameworks_av-a533975a8e3bb741948750a68a2c962a48777fe0.zip frameworks_av-a533975a8e3bb741948750a68a2c962a48777fe0.tar.gz frameworks_av-a533975a8e3bb741948750a68a2c962a48777fe0.tar.bz2 | |
Merge chromium to 10.0.634.0: Compile fix
base/thread.h moved to base/threading/thread.h:
http://codereview.chromium.org/6028009
Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd
Diffstat (limited to 'media/libstagefright/chromium_http')
| -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" |