diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-05-21 08:40:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-21 08:40:39 +0000 |
| commit | c28716964c4525bf9a291404d7f14e74de23f36f (patch) | |
| tree | 29f4e22b92e0af80e2425c40c3aadb48952f1acf /tools | |
| parent | 77669abb8300b672700418216939b9253dc98bee (diff) | |
| parent | 6099fd21e190ffdf8e03ba6d96cce0d53c2765fd (diff) | |
| download | frameworks_base-c28716964c4525bf9a291404d7f14e74de23f36f.zip frameworks_base-c28716964c4525bf9a291404d7f14e74de23f36f.tar.gz frameworks_base-c28716964c4525bf9a291404d7f14e74de23f36f.tar.bz2 | |
am 6099fd21: Merge "Fix build." into klp-modular-dev
* commit '6099fd21e190ffdf8e03ba6d96cce0d53c2765fd':
Fix build.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java | 2 |
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 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 @@ 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. } |