Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa314255 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

resolve merge conflicts of ae7641a8 to nyc-dev-plus-aosp 

am: c7d4074a

* commit 'c7d4074a':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: Iac013f281d63fe627f4d216f187619adad2d2ccc
parents 3f8c335e c7d4074a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment