Merge "[automerger skipped] Merge "Add tests for DhcpErrorEvent" into qt-dev am: 44bb6d00a7 -s ours
am: 5825062407 -s ours
am skip reason: change_id I9b65a2eef94567d2b79a9955619938e64906080d with SHA1 5bc4f002b0 is in history
Change-Id: I435720a98be4501e4ebabde8be91948cdbde7a20
This commit is contained in: