Commit d2d25fcd authored by Nicolas Prévot's avatar Nicolas Prévot Committed by Android (Google) Code Review
Browse files

Merge "Nfc shouldn't initiate bluetooth connection if disallowed." into nyc-dev

parents 18e1ba6a 38609ffd
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