tree 970be56df73727dd91f7ef24de2d679f2f2f667c
parent b6114c7b66744729b8e0e9142e8b07eba41637d5
parent 6ba16ba75232000740d0532e936df88e33b49b05
author David 'Digit' Turner <digit@android.com> 1314665873 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314665873 -0700

am 6ba16ba7: Merge "emulator: opengl: add initLibrary function to render library"

* commit '6ba16ba75232000740d0532e936df88e33b49b05':
  emulator: opengl: add initLibrary function to render library