tree c4c5187eab21482c296ac861b6f227b9bd78e8fc
parent ae80f190cdb40b5d848099b78d070442be37cf3c
parent 533f6bba1578c6d8a471f5a7a271ea41661b513f
author Nicolas Norvez <norvez@google.com> 1497304422 +0000
committer android-build-merger <android-build-merger@google.com> 1497304422 +0000

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

Change-Id: I7a5886b9a9c325036007ad9251b0952fdbd7a206