Skip to content
Commit 304f1c0e authored by Tyler Gunn's avatar Tyler Gunn
Browse files

resolve merge conflicts of ed954292 to qt-qpr1-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8d02276d6d1155fbea6620aba3a9e149e9d4d3f6
parents 0e71b335 ed954292
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