tree 282aea1c07568512121c7b6762eda04aeeacd40e
parent 4c7257defb5578e08d68665879656fd3dc30eb25
parent f7869e21e102416ecccee8675a17965abc8a5c50
author Josh Gao <jmgao@google.com> 1585718172 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585718172 +0000

[automerger skipped] minadbd: statically link libadbd. am: 22beef1b28 am: 9267225df0 -s ours am: 0d6340f386 -s ours am: f7869e21e1 -s ours

am skip reason: Change-Id I5233b1a23c14f9d478bb77c25ebdbb0ce45bcc5a with SHA-1 5ee3eba34f is in history

Change-Id: I195fc9916fa543351adcad7637c68fac64356738