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

am: aeef7c4748 Change-Id: I9d12601b4db0108f313c1a69ada67c92929f548b
2016-06-22 22:41:52 +00:00
parent 1f358b11ae aeef7c4748
commit a34b917ce0
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