Merge \\"Fix build due to missing abstract method impl\\" into nyc-dev am: aeef7c4748

am: e0dc709ac8 Change-Id: I2360c6d049352c4e32f33096d3f659d636941417
2016-06-22 22:47:39 +00:00
parent 8a24cfb055 e0dc709ac8
commit c8aa7f98c1
1 changed files with 6 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
@@ -1798,6 +1798,12 @@ public final class BridgeContext extends Context {
        return null;
    }

+    @Override
+    public Display getDisplay() {
+        // pass
+        return null;
+    }
+
    @Override
    public int getUserId() {
        return 0; // not used