tree f59e7fb0aa2849b481f0bdc6195f2247d7a09459
parent e9922a88319a3ac0a2279603538b63c78566ca15
parent 00f135d1beba9ea79732625e9bf3fcbebeb797b3
author Jakub Pawlowski <jpawlowski@google.com> 1528734378 -0700
committer android-build-merger <android-build-merger@google.com> 1528734378 -0700

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

Change-Id: I135fab3c06ec72ace8b43d2355ee5ba578306a1c