diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-12-01 18:50:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-01 18:50:36 -0800 |
| commit | 48e07296800c49f8bc9b34cc57372593021f79a1 (patch) | |
| tree | d3726e2b235dc300cacf5153cae2da9f3566bdf8 /opengl/java/android/opengl/Texture.java | |
| parent | 88c02e8c5d30c053a4faa897e322540f61914718 (diff) | |
| parent | bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10 (diff) | |
am bfb3dec2: Merge "More social integration." into ics-mr1
* commit 'bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10':
More social integration.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions