OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 22:55:38 +0000 (15:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 22:55:38 +0000 (15:55 -0700)
commit02034d3568fb3b984e8d185d70e18ba19e592ba3
treef17e33269cfecca5687d1175fd3858a1c265ac51
parent19eca316ca4a6c3c59f7eb469b33473e0ad0405a
parenta2d776b2d36b38d94a30fc5692fd71ce9697fe9c
merge from open-source master

Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
core/jni/android_server_BluetoothEventLoop.cpp
telephony/java/com/android/internal/telephony/SMSDispatcher.java