am c5a640ee: Merge change Icce4f510 into eclair

Merge commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72' into eclair-mr2

* commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72':
  change BT sample minsdkversion to 6 because it
This commit is contained in:
Scott Main
2009-12-03 18:14:59 -08:00
committed by Android Git Automerger

View File

@@ -17,7 +17,7 @@
package="com.example.android.BluetoothChat" package="com.example.android.BluetoothChat"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<uses-sdk minSdkVersion="5" /> <uses-sdk minSdkVersion="6" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />