tree 6344fe445df39bff75a84042cf41a1f1ff6a8dd3
parent 33bfac2f5e54ad75a084759dd24c21902f1c7b53
parent ef4e02438c380c70b43ade1f11a298c299cc0882
author Baligh Uddin <baligh@google.com> 1603476501 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603476501 +0000

[automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb" am: 7bc92050e3 am: 7f4a3daee5 -s ours am: 7f3688598a -s ours am: a4fc503b41 -s ours am: ef4e02438c -s ours

am skip reason: Change-Id Ied3afa5d19d814155c5ecbe2363ba544f2ab96b7 with SHA-1 4f22d8699c is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1465385

Change-Id: Id9050d31a0e6a0ebbe7908d27a3d86eac603512f