From: Eric Fischer <enf@google.com>
Date: Tue, 17 Nov 2009 04:01:38 +0000 (-0800)
Subject: am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair
X-Git-Tag: android-7.1.2_r17~1451^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dd0279d592788cfa0d88398c0d946c34a3affa37;p=android-x86%2Fpackages-apps-Bluetooth.git

am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair

Merge commit '95b2e5f9505a995ce293339fab44c9ec7f7866ea' into eclair-mr2-plus-aosp

* commit '95b2e5f9505a995ce293339fab44c9ec7f7866ea':
---

dd0279d592788cfa0d88398c0d946c34a3affa37