From: Jakub Pawlowski <jpawlowski@google.com>
Date: Thu, 10 Nov 2016 20:31:12 +0000 (+0000)
Subject: Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6... 
X-Git-Tag: android-x86-8.1-r1~7626
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1cc78aa2c31780d1526944b5458cf12a916649cc;p=android-x86%2Fframeworks-base.git

Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6 am: f59ad8bd68
am: 196fe3597c

Change-Id: Idf087fc9dcd88733ec7755196fab3eac944bf8cf
---

1cc78aa2c31780d1526944b5458cf12a916649cc