tree 2e2b3ea39d42bfe668635a526b31dc9fa1b8354b
parent 7f7ac8cd19f1a7fc61aa640505747dee9036fa61
parent dc77a22850e31eb369ec9776c13c967566bf61d0
author Elliott Hughes <enh@google.com> 1351836507 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351836507 -0700

am dc77a228: Merge "Allow dlopen("egl/blah.so")."

* commit 'dc77a22850e31eb369ec9776c13c967566bf61d0':
  Allow dlopen("egl/blah.so").