Merge "Fix the build."

2013-02-21 01:03:21 +00:00
parent 487767cfec ef04a9b7e1
commit ec6156f9e8
1 changed files with 8 additions and 0 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
@ -1398,4 +1398,12 @@ public final class BridgeContext extends Context {
        // pass
        return null;
    }
+
+    /**
+     * @hide
+     */
+    @Override
+    public int getUserId() {
+        return 0; // not used
+    }
 }