diff options
| author | Doug Zongker <dougz@android.com> | 2009-10-13 17:11:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-13 17:11:12 -0700 |
| commit | 33ce433ac2964bef800922624db088e99706012d (patch) | |
| tree | 46f342d76e6b06a3f2f7c73dbc01c310737af29c /opengl/java/android/opengl/Texture.java | |
| parent | 638b1ca07c92b520356e00b41a49605872521ed3 (diff) | |
| parent | a973eaea4597d819671c5caab8feed442e9a1af5 (diff) | |
am a973eaea: am b5b67779: Merge change I7fa8c508 into eclair-mr2
Merge commit 'a973eaea4597d819671c5caab8feed442e9a1af5'
* commit 'a973eaea4597d819671c5caab8feed442e9a1af5':
make erase-password-on-SIM-change optional
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions