OSDN Git Service

am d3bbcaff: resolved conflicts for merge of 21938749 to jb-mr1-dev
authorJean-Baptiste Queru <jbq@google.com>
Mon, 20 Aug 2012 17:25:39 +0000 (10:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Aug 2012 17:25:39 +0000 (10:25 -0700)
commitd42a32ee01dab32047502bbbaf0465f4f0f3f6be
tree0f2ff8b428e9eed40c59f2287c90b54806cfb963
parentada508884284f9cd2025f683dd4ac4c66a1ffc08
parentd3bbcaff6f0e08db0412d92f42562a2826a58bec
am d3bbcaff: resolved conflicts for merge of 21938749 to jb-mr1-dev

* commit 'd3bbcaff6f0e08db0412d92f42562a2826a58bec':
  Fix error trap in SurfaceTexture Client