diff options
| author | Scott Main <smain@google.com> | 2010-04-29 15:25:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-29 15:25:31 -0700 |
| commit | cd845f37ba9a6c9cdcf1cde5277707265251e337 (patch) | |
| tree | f96d6f1babe708166a1748d7360fc53f654ff621 /opengl/java/android/opengl/Texture.java | |
| parent | daedd81f089c296ac7355e9be47f1e4c6d645b04 (diff) | |
| parent | 1d328033277aef352a80f06f3520a86cbdc9c48f (diff) | |
am 1d328033: am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '1d328033277aef352a80f06f3520a86cbdc9c48f' into kraken
* commit '1d328033277aef352a80f06f3520a86cbdc9c48f':
docs: rewrite information about using shared preferences, internal and
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions