Merge "Fix build for real"

2015-04-17 22:50:41 +00:00
parent f9978f863f e8b6debd9b
commit 712aa62931
1 changed files with 1 additions and 2 deletions
--- 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.annotation.Nullable;
 import com.android.annotations.Nullable;
 import com.android.ide.common.rendering.api.AssetRepository;
 import com.android.ide.common.rendering.api.ILayoutPullParser;
@@ -1403,7 +1402,7 @@ public final class BridgeContext extends Context {
    }

    public void sendBroadcastAsUser(Intent intent, UserHandle user,
-            @Nullable String receiverPermission, int appOp) {
+            String receiverPermission, int appOp) {
        // pass
    }