diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-02-20 20:59:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 20:59:08 -0800 |
| commit | dda12a97461867a5e0bbdb836a9ecaa265b6edc8 (patch) | |
| tree | b51f89c46bfa6a5b2d1bb49c29eec76114c1b637 /Android.mk | |
| parent | 731f138b820b50c4ccd4c36ed551f6001d0fcfc6 (diff) | |
| parent | ac8bdfe4f06367e06e43d8759b6009b483a5e668 (diff) | |
| download | frameworks_base-dda12a97461867a5e0bbdb836a9ecaa265b6edc8.zip frameworks_base-dda12a97461867a5e0bbdb836a9ecaa265b6edc8.tar.gz frameworks_base-dda12a97461867a5e0bbdb836a9ecaa265b6edc8.tar.bz2 | |
am ac8bdfe4: Merge "resolved conflicts for merge of baaa080b to master"
* commit 'ac8bdfe4f06367e06e43d8759b6009b483a5e668':
Add a new "doze mode" based on Dream components.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -183,6 +183,7 @@ LOCAL_SRC_FILES += \ core/java/android/print/IWriteResultCallback.aidl \ core/java/android/printservice/IPrintService.aidl \ core/java/android/printservice/IPrintServiceClient.aidl \ + core/java/android/service/dreams/IDozeHardware.aidl \ core/java/android/service/dreams/IDreamManager.aidl \ core/java/android/service/dreams/IDreamService.aidl \ core/java/android/service/wallpaper/IWallpaperConnection.aidl \ |