tree 285ba6c6f11cfc0d1bf7781b7a0291a067a205ef
parent 2f2882a04e50af2cf8a7b99d3c2a184c131740fa
parent fcf0ede16257136760821976b185c3ac44f961ab
author Jean-Baptiste Queru <jbq@google.com> 1317324907 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317324907 -0700

am fcf0ede1: Ignore 013607f9 from gingerbread (already here)

* commit 'fcf0ede16257136760821976b185c3ac44f961ab':
  emulator: enable opengl emulation modules