Skip to content
Commit 85bf88e4 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: Ib7ad4f17e82c90da5ef3f80e2ab88c0b53112c60
Merged-In: I9d25f5dc64299e666527ca8e23d7233966901c4e
parents 15da1fe4 8ef96325
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