commit | 3abb2976905d34ddf7bfe54e68bace0e0aad1ce5 | [log] [tgz] |
---|---|---|
author | Mathias Agopian <mathias@google.com> | Thu Oct 21 13:48:42 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 13:48:42 2010 -0700 |
tree | 199d2680bd1bbefb67149a0c40c41b360e320b0e | |
parent | 47a79466a72715d57934016a3cad19444dad0642 [diff] | |
parent | 23cafe75f421bf3057697c7444f82d0455d5273f [diff] |
am 4ceee5a6: (-s ours) am 73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread Merge commit '4ceee5a6b0089ffbec75690b7284f80d481ab212' * commit '4ceee5a6b0089ffbec75690b7284f80d481ab212': propagate RS context priority to EGLContext when possible. DO NOT MERGE.