Merge "Fix build."

1 files changed, 6 insertions, 0 deletions

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 93b3f4f6710d..a5507eadcf96 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,6 +16,7 @@
 
 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;
@@ -1116,6 +1117,11 @@ public final class BridgeContext extends Context {
                 }
 
                 @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;