Skip to content
Commit 20541d66 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 

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

Change-Id: I639c02d1f9a76e6a9ac027f01b0216127e206765
parents 82a11e87 a0b5690c
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