| commit | dd00090530340de22ca60f79446b5fe3050cd95f | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sat Jan 25 00:44:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 25 00:44:54 2014 +0000 |
| tree | d382f32466adfd949c09d6c6d3de8a1ffe5d764e | |
| parent | 03691218ada2fb7e084ad4ae7ddd54f9b28d5611 [diff] | |
| parent | e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c [diff] |
am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile errors" * commit 'e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c': libGLES_android: fix 64-bit compile errors