tree 16a9ff23b0862f5003b6c099343976267341d529
parent b9494d5c9d44e4a59b6d510fea1665de434f3c6b
parent a0fef1c8bb22443402fb3aeda7ce70f7d5775b0a
author Jesse Hall <jessehall@google.com> 1334765075 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334765075 -0700

Merge "Fix deadlock when cleaning objects in eglTerminate"