commit 8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d
author Nick Pelly <npelly@google.com> Wed Nov 04 17:37:07 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 04 17:37:07 2009 -0800
tree 0daef2ec73313f34324243f367a2abc2a2d27de0
parent e772eb7af049b55c89241fae799569030c1f5570
parent 61b01632915181fcf725dc4933cad8c81e700115

am 61b01632: Merge change I9490271c into eclair

Merge commit '61b01632915181fcf725dc4933cad8c81e700115' into eclair-mr2

* commit '61b01632915181fcf725dc4933cad8c81e700115':
  Add BluetoothDevice to SDK AIDL list.

Android.mk

diff --git a/Android.mk b/Android.mk
index a40d3f9..f538d8e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -209,6 +209,7 @@
 	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 \