diff options
| author | 2009-05-21 16:29:38 -0700 | |
|---|---|---|
| committer | 2009-05-21 16:29:38 -0700 | |
| commit | a47f02afb1e1f2c4abd9379c13903a5dde89d354 (patch) | |
| tree | 8a0f2d2172c27aa2dba4eae77a4420433af84294 /opengl/libagl/TextureObjectManager.cpp | |
| parent | a498449e2b11ed5f15e8c8fda9a429850f891434 (diff) | |
change 2115 wasn't merged properly into master. this fixes that.
Merge change 2115 into donut
* changes:
bring the native_handle stuff back from master_gl
Conflicts:
libs/binder/Parcel.cpp
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions