| commit | c28716964c4525bf9a291404d7f14e74de23f36f | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed May 21 08:40:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 08:40:39 2014 +0000 |
| tree | 29f4e22b92e0af80e2425c40c3aadb48952f1acf | |
| parent | 77669abb8300b672700418216939b9253dc98bee [diff] | |
| parent | 6099fd21e190ffdf8e03ba6d96cce0d53c2765fd [diff] |
am 6099fd21: Merge "Fix build." into klp-modular-dev * commit '6099fd21e190ffdf8e03ba6d96cce0d53c2765fd': Fix build.
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 908fc47..95221fb 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
@@ -56,7 +56,7 @@ } @Override - public void goToSleep(long arg0, int arg1) throws RemoteException { + public void goToSleep(long arg0, int arg1, int arg2) throws RemoteException { // pass for now. }