Skip to content
Commit cadd0880 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

[automerger skipped] Merge changes I2c00af07,I2f49fa7d into qt-dev 

am: 7610ba91 -s ours
am skip reason: change_id I2c00af07aac4a15770d3acab011a36e2e4803bfc with SHA1 e3ef3c8f is in history

Change-Id: I777b32e6290cf691500468c9bbc05c08f1b6d1e6
parents 680ae837 7610ba91
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