tree 6aaea69f1a4289995c0481348e827422d825c9cb
parent 85d5f0584a15e7e523b8c7b8b1c4d06cf128131d
parent 3d66e42610d3c55251d3f96f58eba5ad871bc548
author TreeHugger Robot <treehugger-gerrit@google.com> 1587709635 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587709635 +0000

[automerger skipped] Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" into rvc-dev am: 3d66e42610 -s ours

am skip reason: Change-Id I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72 with SHA-1 b124dcff2c is in history

Change-Id: Ic43fce861a3a36e58fea0307e659d82530275b70