OSDN Git Service

Merge "ScanRecord.getServiceData NPE fix" am: d62f74e806
authorJakub Pawlowski <jpawlowski@google.com>
Mon, 11 Jun 2018 16:16:39 +0000 (09:16 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jun 2018 16:16:39 +0000 (09:16 -0700)
commit00f135d1beba9ea79732625e9bf3fcbebeb797b3
tree8b3061073442ac5670fbc3aebeef2b3dc2c4065a
parent3ef3fae23241a453111c3143e7813bf2eea7dcf6
parent8d0eb018436683c7fa6147277c6a1168b292af5e
Merge "ScanRecord.getServiceData NPE fix" am: d62f74e806
am: 8d0eb01843

Change-Id: I9a7e94cb51f724da7d089fbe027a06d36ad5ebb4