diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-12 14:12:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 14:12:25 -0700 |
| commit | 6ddb6ff99e745719b64bdb8f99fbd35db99f90f1 (patch) | |
| tree | 12283462dbf86ce6f21d9a4d5e7757639be0e371 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8dbc26622419821b3e56e565b22f50f2ce43a680 (diff) | |
| parent | 56151325d0a66f79482b4766e3382913b5625485 (diff) | |
am 7d952644: merge from open-source master
Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken
* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
Support to display message when operation is blocked due to FDN being enabled
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions