commit | 345c6114dad73fad026fa0925cca133236091dc2 | [log] [tgz] |
---|---|---|
author | Conley Owens <cco3@android.com> | Wed Apr 27 13:54:08 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 27 13:54:08 2011 -0700 |
tree | 38e27ce72830ed11a0ca49852529e3b0cbefad9e | |
parent | e940cc1ea036795d87502d84335b6f12ddabf1f6 [diff] | |
parent | ddc25bb92eb10ee40559424a75cac5e440b75575 [diff] |
am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage" * commit 'ba5aebd106c61567ad6be905efd18902025735aa': Add lock before calling initEglImage