commit 061ad637f7d17ea3972d9bbb15b80b96e02f47c1
author Eric Fischer <enf@google.com> Mon Aug 01 11:15:58 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 01 11:15:58 2011 -0700
tree 405af4697e1039904aa5431bde4cf5b22820379b
parent 407c94a147ac52dbd3747160748a219553bcbf2b
parent fa4c10e9ba943dbf8abed5ebc0818a5814888db5

Merge "Import revised translations.  DO NOT MERGE" into gingerbread

include/utils/RefBase.h

diff --git a/include/utils/RefBase.h b/include/utils/RefBase.h
index d92cfb0..0af7e6a 100644
--- a/include/utils/RefBase.h
+++ b/include/utils/RefBase.h
@@ -115,6 +115,7 @@
     // used to override the RefBase destruction.
     class Destroyer {
         friend class RefBase;
+        friend class weakref_type;
     public:
         virtual ~Destroyer();
     private:

opengl/tests/gl_jni/jni/gl_code.cpp

diff --git a/opengl/tests/gl_jni/jni/gl_code.cpp b/opengl/tests/gl_jni/jni/gl_code.cpp
index f031c79..ef66841 100644
--- a/opengl/tests/gl_jni/jni/gl_code.cpp
+++ b/opengl/tests/gl_jni/jni/gl_code.cpp
@@ -181,4 +181,3 @@
 {
     background = 1.0f - background;
 }
-