From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 5 Feb 2010 22:17:41 +0000 (-0800)
Subject: am 0341ac9a: am 8916d261: reconcile main tree with open-source eclair
X-Git-Tag: android-7.1.2_r17~1437
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a122f96371905dc80e496660f8cc1032d1cf634;p=android-x86%2Fpackages-apps-Bluetooth.git

am 0341ac9a: am 8916d261: reconcile main tree with open-source eclair

Merge commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2'

* commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2':
  android-2.1_r1 snapshot
---

3a122f96371905dc80e496660f8cc1032d1cf634