| commit | 14c7f36fc66bc4593c070792da9437b59b0e0cdb | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sat Nov 09 00:59:14 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Nov 09 00:59:14 2013 +0000 |
| tree | bfe7137c71bfe470796c4d415abf753795320b4d | |
| parent | 784639608387602e0c9e448e88db7809577f1667 [diff] | |
| parent | d7997ebc2ae418d593fab83afe484f161f52b455 [diff] |
Merge "Fix BUILD_DALVIK_HOST_JAVA_LIBRARY to BUILD_HOST_DALVIK_JAVA_LIBRARY"
diff --git a/runtime/atomic.cc b/runtime/atomic.cc index c91db79..47cee6a 100644 --- a/runtime/atomic.cc +++ b/runtime/atomic.cc
@@ -23,7 +23,7 @@ #include "base/mutex.h" #include "base/stl_util.h" #include "base/stringprintf.h" -#include "thread.h" +#include "thread-inl.h" #endif namespace art {