commit 68a029edbbd162f2ca783733df37a44d5082ddee
author Igor Murashkin <iam@google.com> Wed Feb 27 00:43:20 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 27 00:43:20 2013 +0000
tree d2f718bff4891e2bfbc07aa521e2b3bb589c8598
parent 30055f1e96f5a04c6ff5fc7f7d5812fca38c2759
parent 89592bbede762588248006f20afd8bd9d4bf5a98

Merge "GraphicBuffer.h: Remove redundant friend class declaration causing warnings" into jb-mr2-dev

include/ui/GraphicBuffer.h

diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h
index d3839ea..4b9b5a8 100644
--- a/include/ui/GraphicBuffer.h
+++ b/include/ui/GraphicBuffer.h
@@ -124,7 +124,6 @@
     friend class Surface;
     friend class BpSurface;
     friend class BnSurface;
-    friend class Surface;
     friend class LightRefBase<GraphicBuffer>;
     GraphicBuffer(const GraphicBuffer& rhs);
     GraphicBuffer& operator = (const GraphicBuffer& rhs);