diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-13 09:53:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-13 09:53:16 -0700 |
| commit | 485b800eacafbf13244ca245f6ddaf47c0d31c08 (patch) | |
| tree | 62c15fc401a7c1b93386844d0a6c80008724a216 /opengl/java/android/opengl/Texture.java | |
| parent | ca20104a3ab0c10d570080e3d3b4ff94fedf60ee (diff) | |
| parent | 1a3b3d48413d9134738c9b457292fb2b71a5dfe4 (diff) | |
am 1a3b3d48: merge from open-source master
Merge commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken
* commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4':
Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions