From: Jakub Pawlowski <jpawlowski@google.com>
Date: Tue, 30 May 2017 13:26:19 +0000 (+0000)
Subject: Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am... 
X-Git-Tag: android-x86-9.0-r1~3410
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e6c56b7dfecb69837ba61e0da55e2f5bf4540d35;p=android-x86%2Fframeworks-base.git

Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp am: 658e1ddc7e" into oc-dev-plus-aosp
am: 8546ca67da

Change-Id: Ice5353450b11baef89c1bdd34ac44e8644139b86
---

e6c56b7dfecb69837ba61e0da55e2f5bf4540d35