tree e85d65cbc780d01da91a0c5834c004c4674e286e
parent 5d14c43f1d2cce3772144f4111b0e08cbd9c6f79
parent dc884c0f54b32406f7ac62943d8016e3834324e0
author Nicolas Norvez <norvez@google.com> 1497304115 +0000
committer android-build-merger <android-build-merger@google.com> 1497304115 +0000

Merge "adbd: optionally use qemud pipe without ro.kernel.qemu" am: b3c363f32c
am: 516ee2445d

Change-Id: Iaf3be508465ea6ab59fc6a7f4fb0b2878d50b279