diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-17 12:30:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 12:30:52 -0700 |
| commit | 590d5971a1aa29f5fb13b3bb533308ce09460901 (patch) | |
| tree | a7502118c6abd0c1aa64eba593b5e63aba3715fa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8fa2e62dd31bc39df7e15cf9207ad88f1861017b (diff) | |
| parent | 95a8679095850fea2d93a289d7340322c70e66ae (diff) | |
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 '9940c8b6c8ab1711c9ee77cb9288888879b0b310':
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