commit | ddc25bb92eb10ee40559424a75cac5e440b75575 | [log] [tgz] |
---|---|---|
author | Conley Owens <cco3@android.com> | Wed Apr 27 13:41:12 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 27 13:41:12 2011 -0700 |
tree | aa1bfc07a0100602f75d30bb7557e1bfa4d673b5 | |
parent | 27030e51a0d00f94ffa157530e8019021085073f [diff] | |
parent | f0015cab94edbf9f361a6ff086b289e006c0edb3 [diff] |
am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage" * commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4': Add lock before calling initEglImage