diff options
author | Nick Pelly <npelly@google.com> | 2009-11-04 17:37:07 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-04 17:37:07 -0800 |
commit | 8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d (patch) | |
tree | 0daef2ec73313f34324243f367a2abc2a2d27de0 /Android.mk | |
parent | e772eb7af049b55c89241fae799569030c1f5570 (diff) | |
parent | 61b01632915181fcf725dc4933cad8c81e700115 (diff) | |
download | frameworks_base-8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d.zip frameworks_base-8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d.tar.gz frameworks_base-8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d.tar.bz2 |
am 61b01632: Merge change I9490271c into eclair
Merge commit '61b01632915181fcf725dc4933cad8c81e700115' into eclair-mr2
* commit '61b01632915181fcf725dc4933cad8c81e700115':
Add BluetoothDevice to SDK AIDL list.
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -209,6 +209,7 @@ aidl_files := \ frameworks/base/core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ frameworks/base/core/java/android/app/Notification.aidl \ frameworks/base/core/java/android/app/PendingIntent.aidl \ + frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \ frameworks/base/core/java/android/content/ComponentName.aidl \ frameworks/base/core/java/android/content/Intent.aidl \ frameworks/base/core/java/android/content/IntentSender.aidl \ |