diff options
| author | 2012-01-19 13:32:51 -0800 | |
|---|---|---|
| committer | 2012-01-19 13:32:51 -0800 | |
| commit | d53f6430b0e81607c480b068bd44b6a28fc45adf (patch) | |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/libagl/TextureObjectManager.cpp | |
| parent | 06449fbbb8564efad72ac6f19c4c060a1f09aac1 (diff) | |
| parent | 75a4189c2e53d286092b4016d6db0e7bb450f361 (diff) | |
am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1
* commit '4e552533ea049970b54c1cdba5afb7d13496c3c1':
cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions