diff options
| author | Marc Blank <mblank@google.com> | 2010-04-29 16:28:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-29 16:28:50 -0700 |
| commit | 8abcce1f7b29a4f759d85c72f3f9e5183a5fe902 (patch) | |
| tree | 261deff71e64c2b6527dea87728f9ee2a169894d /opengl/java/android/opengl/Texture.java | |
| parent | 82b027e90efc816f96783d47cff1c088d07c7b5a (diff) | |
| parent | 9ca816649bd2af7d540f375be8fcc503c50aef72 (diff) | |
am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '9ca816649bd2af7d540f375be8fcc503c50aef72' into kraken
* commit '9ca816649bd2af7d540f375be8fcc503c50aef72':
Expose _id in ExtendedProperties subValues
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions