diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-06 14:09:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-06 14:09:36 -0800 |
| commit | eb7e2d29de2a2163b3433ec1cf146e94c539e290 (patch) | |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d0b5f04467264940656108d375e8fb63c9e57ee0 (diff) | |
| parent | a6739d66f977d07fad8a79a49170ea74bbb7ff2b (diff) | |
am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '52da99fac85d1e16a3c95bdd9c039801e920e6d1':
Skia API changes as a result of an update to the Skia library.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions