Commit 0cc0fe84 authored by Andres Morales's avatar Andres Morales Committed by Android Git Automerger
Browse files

am 4f146f35: Merge "Fix NfcDiscoveryParameters" into lmp-mr1-dev 

* commit '4f146f35':
  Fix NfcDiscoveryParameters
parents c71ac26c 4f146f35
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment