diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-07-27 16:54:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-27 16:54:40 -0700 |
| commit | 3b54d4533a82e9fc6e08813ed4aeeb1d40375277 (patch) | |
| tree | a49d05563de9b9b0a162a3c2f50f003ff4430168 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5c7efd4e0ef638b04a81706a3dcb523a01128d73 (diff) | |
| parent | 928b1c94a5e207258429fd4ecf4207ff41aa18b3 (diff) | |
am 4d544376: am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Merge commit '4d5443762bd2b44b28edc2f2f75728911d70eac1' into gingerbread-plus-aosp
* commit '4d5443762bd2b44b28edc2f2f75728911d70eac1':
COMMENT ONLY change to clarify ContentProvider documentation.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions