| commit | 77ddc3a7cda775e83a1dfdd7532e8383e9bcdd65 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Jun 22 22:54:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 22 22:54:06 2016 +0000 |
| tree | 1c98453478c797bd5bacb6df7a0d51463f1f0926 | |
| parent | 606e600406679eca46b9f487ed05b757a355219f [diff] | |
| parent | 1835f6367385080ebcb1c02fe02339c077f0c9cf [diff] |
Merge \\\"Fix build due to missing abstract method impl\\\" into nyc-dev am: aeef7c4748 am: e0dc709ac8 am: c8aa7f98c1 Change-Id: Id3b9a1e0797f26d34415938dee0a032541be2a6c
diff --git a/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java index f87269b..616cb57 100644 --- a/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java +++ b/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1799,6 +1799,12 @@ } @Override + public Display getDisplay() { + // pass + return null; + } + + @Override public int getUserId() { return 0; // not used }