tree af526858c576d9fb289a875a318057470761f19b
parent d84df05490e8b102e81cca848f65c174398be1b6
parent ac505b86b45462d9883f9c36fad0ef85e0885ee4
author Conley Owens <cco3@android.com> 1303936872 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303936872 -0700

am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
  Add lock before calling initEglImage