diff options
| author | Jason Sams <jsams@google.com> | 2012-02-07 16:40:51 -0800 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2012-02-07 16:40:51 -0800 |
| commit | eb5b73504d4e12c390985b573b61b4d9bcaa74dd (patch) | |
| tree | 5e89fc08fe442cbb66233203ab0ddd152ec6262d /libs/rs/rsContext.h | |
| parent | f835ca02713e34b0939957389a21022a9a6ce5c9 (diff) | |
| parent | bdeec118a120d2424ff80c54c2f218ed0d52d3e2 (diff) | |
| download | frameworks_base-eb5b73504d4e12c390985b573b61b4d9bcaa74dd.zip frameworks_base-eb5b73504d4e12c390985b573b61b4d9bcaa74dd.tar.gz frameworks_base-eb5b73504d4e12c390985b573b61b4d9bcaa74dd.tar.bz2 | |
Merge commit 'bdeec118' into manualmerge
Conflicts:
libs/rs/rsThreadIO.h
Change-Id: I7f448996a86f41188b47ec3dc353c364692e8bf2
Diffstat (limited to 'libs/rs/rsContext.h')
| -rw-r--r-- | libs/rs/rsContext.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/rs/rsContext.h b/libs/rs/rsContext.h index 2989c53..05c799e 100644 --- a/libs/rs/rsContext.h +++ b/libs/rs/rsContext.h @@ -40,7 +40,6 @@ #include "rsFBOCache.h" #include "rsgApiStructs.h" -#include "rsLocklessFifo.h" // --------------------------------------------------------------------------- namespace android { |