diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-07-12 19:06:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-12 19:06:24 -0700 |
| commit | e339464f1c8efe7e53b761cf44ff5be6e537ecad (patch) | |
| tree | a0a0f599c4ccc11fd7cba44e982e039f7b109f49 /opengl/java/android/opengl/Texture.java | |
| parent | 5a93032dcbe54223e03102d497d7e04370491737 (diff) | |
| parent | 1bcb665825dc97789e8c1b892ec4298fd0b8c552 (diff) | |
am 1bcb6658: Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo
Merge commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552' into gingerbread
* commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552':
Fix issue #2834005: Android Settings.Secure bypass
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions