diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-17 12:38:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 12:38:40 -0700 |
| commit | 247dbd175020126db389a0e18b5854a51bfa6965 (patch) | |
| tree | e6512f50f1ed5a34084f3f8939134764c9a33570 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3d8e6ed45e302ae4df6f60bea4d68c92b2a3acc1 (diff) | |
| parent | 590d5971a1aa29f5fb13b3bb533308ce09460901 (diff) | |
am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
* commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707':
Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions