diff options
| author | Dan Morrill <morrildl@google.com> | 2010-05-06 16:31:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 16:31:31 -0700 |
| commit | 64c83cfb6a5b6d23a96e8ba618d7be08f18bbdb0 (patch) | |
| tree | 98f63c0ca82ba9f2eee4cdebeddaa966c0831431 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6dcfe1413ac65555a2fa29c90fdf806043a3f381 (diff) | |
| parent | 126a6eab491e8acff7b7f47684b7ef32255356aa (diff) | |
am 60b02cab: am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '60b02cab9cba74e4fe1fcbe64af85ed867d20cf9' into kraken
* commit '60b02cab9cba74e4fe1fcbe64af85ed867d20cf9':
Adding PacketVideo attribution in NOTICE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions