tree 654a3e320e6f40997e99bdf5ff1f6d4376ccec2c
parent c784588597a9f620bc10da3e1c02ca2a8df021f6
parent 9b19d582d94a343437aacf962b8b95b83361bc10
author Jesse Hall <jessehall@google.com> 1326330822 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326330822 -0800

am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1

* commit '9b19d582d94a343437aacf962b8b95b83361bc10':
  EmuGL: handle NULL data in glBufferData