summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lima <joselima@google.com>2014-08-08 23:59:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-08 23:07:59 +0000
commit7f708ecc2f1dcebd516d9f445ec838a4385512fc (patch)
treeee25ea8adab144ab41ff22545e5bd88552c2624a
parenta6f4d58b9094e842b5fd41439db823b66b841393 (diff)
parentb6d77e2d16df7532f5e9bfb7c2ada9a4af92fc3c (diff)
downloadframeworks_base-7f708ecc2f1dcebd516d9f445ec838a4385512fc.zip
frameworks_base-7f708ecc2f1dcebd516d9f445ec838a4385512fc.tar.gz
frameworks_base-7f708ecc2f1dcebd516d9f445ec838a4385512fc.tar.bz2
Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index cd2cebb..4a97c28 100644
--- a/Android.mk
+++ b/Android.mk
@@ -454,7 +454,7 @@ aidl_files := \
frameworks/base/core/java/android/os/DropBoxManager.aidl \
frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \
frameworks/base/core/java/android/os/ParcelUuid.aidl \
- frameworks/base/core/java/android/os/PersistableBundle.aidl \
+ frameworks/base/core/java/android/os/PersistableBundle.aidl \
frameworks/base/core/java/android/print/PrinterInfo.aidl \
frameworks/base/core/java/android/print/PageRange.aidl \
frameworks/base/core/java/android/print/PrintAttributes.aidl \
@@ -462,6 +462,7 @@ aidl_files := \
frameworks/base/core/java/android/print/PrinterId.aidl \
frameworks/base/core/java/android/print/PrintJobId.aidl \
frameworks/base/core/java/android/print/PrintJobInfo.aidl \
+ frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \
frameworks/base/core/java/android/view/accessibility/AccessibilityEvent.aidl \
frameworks/base/core/java/android/view/accessibility/AccessibilityNodeInfo.aidl \
frameworks/base/core/java/android/view/accessibility/AccessibilityRecord.aidl \