Skip to content
Commit c93fa740 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

resolve merge conflicts of 01f94b7c to qt-qpr1-dev 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d15aaa7402e4e08f1630aa29892ad6cd68bd2b1
Merged-In: I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b
parent fcfca21b
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