tree cbf9ab3d0c74dc98d440d0b92fdf24d8fb773412
parent 0c7e85da54a525dd7b8391cabc3899504184f636
parent 138f75bbc8cf4e15b2f614ccf71af5fa394598a7
author Jakub Pawlowski <jpawlowski@google.com> 1495840467 +0000
committer android-build-merger <android-build-merger@google.com> 1495840467 +0000

Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd
am: 138f75bbc8

Change-Id: I8c821ed86a85892af7a77c4a8080a1e9fde9fdfa