From: Jamie Gennis <jgennis@google.com>
Date: Mon, 20 Aug 2012 21:37:03 +0000 (-0700)
Subject: am 3eb49879: am 729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase... 
X-Git-Tag: android-x86-4.4-r1~741
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b1d446fe621cfeaaa76a8892b1c99cb73d093d9c;p=android-x86%2Fframeworks-native.git

am 3eb49879: am 729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev

* commit '3eb49879918a54f090ec9252d7d3072dd4d31e94':
  Revert "SurfaceTexture: inherit from ConsumerBase"
---

b1d446fe621cfeaaa76a8892b1c99cb73d093d9c