diff options
| author | Doug Zongker <dougz@android.com> | 2009-10-13 15:04:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-13 15:04:05 -0700 |
| commit | a973eaea4597d819671c5caab8feed442e9a1af5 (patch) | |
| tree | 705511fad420a70d67c4403481be14db832ef943 /opengl/java/android/opengl/Texture.java | |
| parent | 317d1c9e975c729d399406ec697ce0c863826bb6 (diff) | |
| parent | b5b6777903d85349cf4baa07a54e1629551ea712 (diff) | |
am b5b67779: Merge change I7fa8c508 into eclair-mr2
Merge commit 'b5b6777903d85349cf4baa07a54e1629551ea712' into eclair-mr2-plus-aosp
* commit 'b5b6777903d85349cf4baa07a54e1629551ea712':
make erase-password-on-SIM-change optional
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions