[automerger skipped] Merge changes from topic "minadbd_static_libadbd" into rvc-dev am: 3db222694d
-s ours
am skip reason: Change-Id Ie479ae2fbaf1006228a531dab26c7d535ed403db with SHA-1 3735614b28
is in history
Change-Id: I87ca144566ff9c69070f5de8b9aa86b2a8d41e0d
This commit is contained in:
commit
f0fb5629e4