tree 1957b092f2758c195a6922ac2e20e0dcd2ab9376
parent c5dcb8aea1720a95cb062488bbc1604ce44bcb58
parent d2ec7c8f794731aa8323286418422729b0e4270e
author xunchang <xunchang@google.com> 1556576604 -0700
committer android-build-merger <android-build-merger@google.com> 1556576604 -0700

[automerger skipped] Add test for minadbd am: 23f15fcfaf -s ours
am: d2ec7c8f79 -s ours
am skip reason: change_id I2f073b701b25d7f1aafc59868a7a91a8cbefaf49 with SHA1 9c04eb46b7 is in history

Change-Id: I51b7303de78e1037fc3076c1de66c363226a49c8