OSDN Git Service

am 5d0806c9: Merge change Ia70bd8c4 into eclair
authorScott Main <smain@google.com>
Fri, 4 Dec 2009 00:13:19 +0000 (16:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 00:13:19 +0000 (16:13 -0800)
Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2

* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
  add BluetoothChat sample app to the dev guide

1  2 
Android.mk

diff --cc Android.mk
Simple merge