Merge "Fix build" into nyc-dev

2016-03-18 21:20:48 +00:00
parent 620a28bad2 86b66c5ef6
commit 4f29d45ad4
1 changed files with 5 additions and 0 deletions
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
@@ -85,6 +85,11 @@ public class BridgePowerManager implements IPowerManager {
        // pass for now.
    }

+    @Override
+    public void rebootSafeMode(boolean confirm, boolean wait) {
+        // pass for now.
+    }
+
    @Override
    public void shutdown(boolean confirm, String reason, boolean wait) {
        // pass for now.