tree 5dd976794620b12d06699dde46b456feb737de17
parent 5563104ec8d54ea2c7ad3dbb67ac0cdf9fcdf996
parent a2852d1f20f2948dc5cad6a4323836c7f8e1d79b
author Mathias Agopian <mathias@google.com> 1296007506 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296007506 -0800

am a2852d1f: am f6926a63: Merge "egl: clear error on function entry" into honeycomb

* commit 'a2852d1f20f2948dc5cad6a4323836c7f8e1d79b':
  egl: clear error on function entry