Skip to content
Commit 48fc85d7 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "resolve merge conflicts of 95330efa to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 

am: 1b82a4e5

* commit '1b82a4e5':
  Suppress output for Protobuf data if Bluetooth is disabled
parents f2b52ec5 1b82a4e5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment