tree 284d63aa839d9ae6699a9d9384f46744eedc46a4
parent 98a128c83ea79099862e73d57f5790e45f63c6a0
parent ebd3188bde4e1bed569811631579bd94680d32a6
author Mathias Agopian <mathias@google.com> 1287694122 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287694122 -0700

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.