From: Siva Velusamy <vsiva@google.com>
Date: Tue, 4 Feb 2014 19:25:21 +0000 (+0000)
Subject: am 67041e68: am fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"
X-Git-Tag: android-x86-6.0-r1~971
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1d41d5d82c0654313b33d45c7b8943eeba13469e;p=android-x86%2Fframeworks-native.git

am 67041e68: am fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"

* commit '67041e6841d89efb0dbaf4562b601b80be61e1e6':
  GLES_trace: fix compile errors on 64 bit architectures
---

1d41d5d82c0654313b33d45c7b8943eeba13469e