diff options
| author | Jamie Gennis <jgennis@google.com> | 2013-05-07 18:23:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-07 18:23:18 -0700 |
| commit | d2a92b5b97b5a107d327744f216abdea8e0cda89 (patch) | |
| tree | 0a18ab0a646783aa1cd4ffc28e2d07e1cb406792 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2c2283549c72184145c9f030bbfe6124ee75d169 (diff) | |
| parent | db733579a4c64eddd7dadb4ac15f54658ccfc0fb (diff) | |
am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev
* commit 'db733579a4c64eddd7dadb4ac15f54658ccfc0fb':
atrace: add the 'dalvik' trace category
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions