summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-12-06 17:48:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-06 17:48:38 -0800
commit92860d91e921437d9b87d9f1aa27edc0a14cbddd (patch)
tree0b58f551214399aeabda9e029818d4c4e9d1049d /opengl/tests/gl_basic/gl_basic.cpp
parent0fd0cee7fe1f9702a51b0563d42b9664b1996cf7 (diff)
parent15296b548646066f05cb4439ff388b3c0f1d05bd (diff)
am ea294903: am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
* commit 'ea294903ca4c298c44b50b473b9b10ae2b77c9e3': Remove ACTION_TAG_DISCOVERED from protected broadcast list.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions