commit d4d46587665ede9cdd26d12d37368a35232a31e1
author Colin Cross <ccross@android.com> Thu Apr 10 22:41:05 2014 -0700
committer Colin Cross <ccross@android.com> Thu Apr 10 22:41:05 2014 -0700
tree ddb0421962d0e2fd3500ea9d57a31f9b32aac23d
parent 923914bc5b4f48e2524d106527adacc5502ac2b9
parent 90b39abaf95640021d15be70b5841abe8366b33e

resolved conflicts for merge of 90b39aba to master-lockscreen-dev

Change-Id: I2871a1e49c3b443cc7479f2352c652be3b0fb85b

tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 8cb7972..757cdd2 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -460,13 +460,13 @@
     }
 
     @Override
-    public boolean clearWindowContentRenderStats(IBinder token) throws RemoteException {
+    public boolean clearWindowContentFrameStats(IBinder token) throws RemoteException {
         // TODO Auto-generated method stub
         return false;
     }
 
     @Override
-    public WindowContentFrameStats getWindowContentRenderStats(IBinder token)
+    public WindowContentFrameStats getWindowContentFrameStats(IBinder token)
             throws RemoteException {
         // TODO Auto-generated method stub
         return null;