tree 001b04f827d14a37ee28082d345d30c1740fbbd4
parent 7f39c414626aa20498e2887fc709cdd23915b188
parent 8a8470063ab226b395295b086b27b7912350def5
author Treehugger Robot <treehugger-gerrit@google.com> 1644222172 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644222172 +0000

[automerger skipped] Merge "Delete DhcpResults from frameworks/base." am: e8a2915699 am: e023531772 am: 025041f3f6 am: 8a8470063a -s ours

am skip reason: Merged-In I356ee7b24613e84b8a90ddccd6d25d0742d13ae7 with SHA-1 a2ea37e61e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972384

Change-Id: I38c050ca9aa1b84259628c99de7c79718cec5ae8