From: Ed Heyl <ed@google.com>
Date: Wed, 26 Oct 2011 14:36:19 +0000 (+0000)
Subject: am 51bfce5b: Merge remote branch \'goog/ics-mr0\' into ics-mr1
X-Git-Tag: android-7.1.2_r17~1255
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0ad18d26;p=android-x86%2Fpackages-apps-Bluetooth.git

am 51bfce5b: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit '51bfce5b57fc9830c3a7ddbb5959e9274a287724':
---

0ad18d26b4e9a5d1734703af45a9dd8ecedcd959