tree 8b3061073442ac5670fbc3aebeef2b3dc2c4065a
parent 3ef3fae23241a453111c3143e7813bf2eea7dcf6
parent 8d0eb018436683c7fa6147277c6a1168b292af5e
author Jakub Pawlowski <jpawlowski@google.com> 1528733799 -0700
committer android-build-merger <android-build-merger@google.com> 1528733799 -0700

Merge "ScanRecord.getServiceData NPE fix" am: d62f74e806
am: 8d0eb01843

Change-Id: I9a7e94cb51f724da7d089fbe027a06d36ad5ebb4