Commit fea0c08e authored Nov 11, 2011 by Akwasi Boateng Committed by Android Git Automerger Nov 11, 2011

am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of...

am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp

* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
  Make the overridden ImageView#setVisibility remotable
  Clamp non-monotonic stats instead of dropping.
  DO NOT MERGE. Fix leak in LayoutTransition
  Fix lastVisible/global rects
  Fix Wimax-less build.
  Fix leak in LayoutTransition
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
  Terminate EGL when an app goes in the background
  boot animation is dithered and scaled
  Fix NdefRecord byte-stream constructor.
  PopupWindow dismiss() can get into a recursive loop.
  Fold WiMAX state into the mobile RSSI.
  Remove dedicated wimax icon to fix RSSI layout.

parents 147a9139 19353c41

opengl/libs/EGL/egl_display.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,8 @@ public:
		inline bool isValid() const { return magic == '_dpy'; }
		inline bool isAlive() const { return isValid(); }

		inline uint32_t getRefsCount() const { return refs; }

		struct strings_t {
		char const * vendor;
		char const * version;