summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorOlawale Ogunwale <ogunwale@google.com>2015-03-30 23:25:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-30 23:25:15 +0000
commit5670d9a2503557ca583eddcab1702800b5016cd9 (patch)
tree260dbad7c862fc9fb9fbd044dd6c5f614948036e /Android.mk
parent88077629748f90211684c2676ca16a8a7c85b9fd (diff)
parent4af5bd7cdaccdba6001a384a81c258f542e74075 (diff)
downloadframeworks_base-5670d9a2503557ca583eddcab1702800b5016cd9.zip
frameworks_base-5670d9a2503557ca583eddcab1702800b5016cd9.tar.gz
frameworks_base-5670d9a2503557ca583eddcab1702800b5016cd9.tar.bz2
am 4af5bd7c: Merge "Add ProcessInfoService to activity manager."
* commit '4af5bd7cdaccdba6001a384a81c258f542e74075': Add ProcessInfoService to activity manager.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index f3c757a..02e3756 100644
--- a/Android.mk
+++ b/Android.mk
@@ -199,6 +199,7 @@ LOCAL_SRC_FILES += \
core/java/android/os/INetworkActivityListener.aidl \
core/java/android/os/INetworkManagementService.aidl \
core/java/android/os/IPermissionController.aidl \
+ core/java/android/os/IProcessInfoService.aidl \
core/java/android/os/IPowerManager.aidl \
core/java/android/os/IRemoteCallback.aidl \
core/java/android/os/ISchedulingPolicyService.aidl \