From f38cb998d6d35ce31a7aa446073e8488305812c2 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 25 Oct 2012 13:17:33 -0700
Subject: [PATCH] Fix conflict with other build fix

Change-Id: Id5286ee8d335b6307f6602e933364f462f19bff2
---
 tests/src/com/android/gallery3d/ui/GLRootStub.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/src/com/android/gallery3d/ui/GLRootStub.java b/tests/src/com/android/gallery3d/ui/GLRootStub.java
index fcc927b2e..25e7bca5b 100644
--- a/tests/src/com/android/gallery3d/ui/GLRootStub.java
+++ b/tests/src/com/android/gallery3d/ui/GLRootStub.java
@@ -34,7 +34,6 @@ public class GLRootStub implements GLRoot {
     public int getDisplayRotation() { return 0; }
     public int getCompensation() { return 0; }
     public Matrix getCompensationMatrix() { return null; }
-    public void requestRenderForced() { }
     public void freeze() {}
     public void unfreeze() {}
     public void setLightsOutMode(boolean enabled) {}
-- 
2.11.0