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

Skip to content
Commit 31675f5b authored by shaohanlin's avatar shaohanlin
Browse files

Merge branch qc2 into vanilla 

 Conflicts:
	drivers/nfc/nq-nci.c

Change-Id: I80ccbe670348b9b6fcab662c8d0a80159d989a4a
parents f1a29892 a02c44a3
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