From: Zhihai Xu <zhihaixu@google.com>
Date: Sun, 9 Mar 2014 19:18:21 +0000 (+0000)
Subject: am 0ff8f69e: am 87f26bcd: Merge "DO NOT MERGE BLE Secuity manager state machine gener... 
X-Git-Tag: android-x86-7.1-r1~1706^2~38
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7dbaf9fa107c78eab78a2f969615cc407851393c;p=android-x86%2Fsystem-bt.git

am 0ff8f69e: am 87f26bcd: Merge "DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event." into klp-dev

* commit '0ff8f69e73503b342abd0eb02769e78b49f3fbef':
  DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event.
---

7dbaf9fa107c78eab78a2f969615cc407851393c