tree 46fcde2521016d0406c12e203472c99f5b64c57d
parent 517e03c6215e1bad30159d2fdd6f3a91a2693822
parent a72cc2056477d389a47d1a30ff2d494dfd2e4b4e
author The Android Open Source Project <initial-contribution@android.com> 1301528304 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301528304 -0700

am 761e4500: am 5e1383f2: am ad663d80: Merge from gingerbread

* commit '761e4500f31fe59748a53a4f6a85daccf5cd3467':
  egl: fixes for object refcounts