diff options
| author | Stephen Hines <srhines@google.com> | 2013-07-11 11:45:00 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-07-11 11:45:00 -0700 |
| commit | 140a7acade66ab5d1f3dc55803a3a65a71f3f86c (patch) | |
| tree | b509442693511faf019bb0479669f8422362541f /rsScriptC.cpp | |
| parent | 3ad07bf0ccb9064695013d8c61bacaec26a97e6b (diff) | |
| parent | 5376c9bfa7f4434dde29a31a7437f25708b1b009 (diff) | |
| download | rs-140a7acade66ab5d1f3dc55803a3a65a71f3f86c.tar.gz | |
resolved conflicts for merge of 5376c9bf to master
Change-Id: I51507da10f8d7116a2aa29446a00a43d397a37c8
Diffstat (limited to 'rsScriptC.cpp')
| -rw-r--r-- | rsScriptC.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rsScriptC.cpp b/rsScriptC.cpp index 632dca8f..d6662a3d 100644 --- a/rsScriptC.cpp +++ b/rsScriptC.cpp @@ -24,9 +24,8 @@ #endif #endif -#ifndef RS_SERVER +#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) #include "utils/Timers.h" -#include "utils/StopWatch.h" #endif #include "cutils/trace.h" |