tree 9ea80adc91fff7d1145e28b62bc4b1268d4df9c0
parent bacecf28fd14a2701a5619aa39191b3077a9256c
parent fae10c236a9ce9abc47ac9e71bd5e0f5c05be852
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582351505 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582351505 +0000

Merge "adbd: fix build breakage." am: 5f241c7de5 am: fae10c236a

Change-Id: Iff96e234ca3666827027de159d73be52b6c01c3d