summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-05-21 11:16:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-21 11:16:58 +0000
commite6652217647af133de6981e59abac16a3e908166 (patch)
tree97aed096ad454006b97198f79cdb8cdd5af70bfa /tools
parent4bfcae9a3f3f1e225bed08b0a7c09ebf293d6c87 (diff)
parentc28716964c4525bf9a291404d7f14e74de23f36f (diff)
downloadframeworks_base-e6652217647af133de6981e59abac16a3e908166.zip
frameworks_base-e6652217647af133de6981e59abac16a3e908166.tar.gz
frameworks_base-e6652217647af133de6981e59abac16a3e908166.tar.bz2
am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-dev
* commit 'c28716964c4525bf9a291404d7f14e74de23f36f': Fix build.
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
index 4eb70aa..00c0f93 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
@@ -61,7 +61,7 @@ public class BridgePowerManager implements IPowerManager {
}
@Override
- public void goToSleep(long arg0, int arg1) throws RemoteException {
+ public void goToSleep(long arg0, int arg1, int arg2) throws RemoteException {
// pass for now.
}