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 | fa855e0e46fc706a2120bc4659aaeaf2ef395a4d (patch) | |
| tree | 2a3d35b589f60ae38bf19449eb9a9b35ed8518ef | |
| parent | 931db87f8fd6fa1fd5b918f3b1fc107e8dca2e0e (diff) | |
| parent | a533975a8e3bb741948750a68a2c962a48777fe0 (diff) | |
| download | frameworks_av-fa855e0e46fc706a2120bc4659aaeaf2ef395a4d.zip frameworks_av-fa855e0e46fc706a2120bc4659aaeaf2ef395a4d.tar.gz frameworks_av-fa855e0e46fc706a2120bc4659aaeaf2ef395a4d.tar.bz2 | |
Merge "Merge chromium to 10.0.634.0: Compile fix"
| -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" |