Skip to content
Commit 35ece52f authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Do not allow division by 0" into qt-qpr1-dev am:... 

[automerger skipped] Merge "Do not allow division by 0" into qt-qpr1-dev am: a4768b7b -s ours am: c1fe7d61 -s ours am: 48436862 -s ours

am skip reason: Change-Id Id1a50ae18a2cd014093a17701f6b62070a62e5ff with SHA-1 96aaa02e is in history

Change-Id: I90b4b8ec50d75cf5436ff8ebc1379928a32ac71e
parents b8d1e5ee 48436862
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