Skip to content
Commit f1ceee01 authored by Inseob Kim's avatar Inseob Kim
Browse files

resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8217f0ad136df63f9861bdb3e18b9d0ae8812214
Merged-In: I6d69fb418bac675bbb9e4ac25c3269dfa3029219
parents 729bac82 5a8c6d97
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