am bba6bb81: am 4c273277: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev

* commit 'bba6bb81373b285b456bb851d37f7f2ecfc742ad':
  Re-enable FAST_TLS in gl2 code
This commit is contained in:
Chet Haase 2012-09-28 12:42:21 -07:00 committed by Android Git Automerger
commit 4cb9e0062e

View File

@ -48,7 +48,7 @@ using namespace android;
#define DEBUG_PRINT_CALL_STACK_ON_ERROR 0
#define SYSTRACE_CALL_GL_API 0
#if USE_FAST_TLS_KEY___
#if USE_FAST_TLS_KEY
#ifdef HAVE_ARM_TLS_REGISTER
#define GET_TLS(reg) \