tree 42b6b2ea14ab40077ad240213201a902f9b1e0d4
parent c6d73d7af4fd2bc821c97e7c4d98fff0ad75f3f1
parent 2276a468202750d743848810675e62a63ace67bb
author David 'Digit' Turner <digit@android.com> 1314641110 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314641110 -0700

am 2276a468: am 846dd223: am dbe3b024: Merge "emulator: opengl: fallback gralloc module"

* commit '2276a468202750d743848810675e62a63ace67bb':
  emulator: opengl: fallback gralloc module