Commit 3486cf4d authored by Dave Mankoff's avatar Dave Mankoff
Browse files

resolve merge conflicts of 0e680785 to qt-r1-dev 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Idf6ca46cd849b6d363fd5f1633877224141a7943
parents 1ec1ecb3 0e680785
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