Skip to content
Commit ea22d08a authored by Junyu Lai's avatar Junyu Lai Committed by android-build-merger
Browse files

[automerger skipped] Merge changes I92f6d977,I06840834 into qt-dev 

am: b05b4d60 -s ours
am skip reason: change_id Ibcb91105e46f7e898b8aa7c2babc3344ef2c6257 with SHA1 e5c3c8cc is in history

Change-Id: I64a66b8c08963428d409908f93c1d557fd9e4ff6
parents 592b9a06 b05b4d60
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