commit c08b0e0dd3e3befa57d497f7560d577651194c7e
author Dianne Hackborn <hackbod@google.com> Tue Oct 13 19:34:44 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 13 19:34:44 2015 +0000
tree 5ae2187acd9cb21767844bd68b1ef40db4cb6ad2
parent 9b90e26427d2bb953e13131a66ed421f9401a6cc
parent 0b128232d22cd15c6100734b4d859499f82afb22

Merge "Revert "Fix build.""

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index a5507ea..93b3f4f 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -16,7 +16,6 @@
 
 package com.android.layoutlib.bridge.android;
 
-import android.os.ResultReceiver;
 import com.android.SdkConstants;
 import com.android.ide.common.rendering.api.AssetRepository;
 import com.android.ide.common.rendering.api.ILayoutPullParser;
@@ -1117,11 +1116,6 @@
                 }
 
                 @Override
-                public void shellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
-                        String[] args, ResultReceiver resultReceiver) {
-                }
-
-                @Override
                 public boolean transact(int code, Parcel data, Parcel reply, int flags)
                         throws RemoteException {
                     return false;