tree 97f8ff16a75a3f144c944e8b4742d59473069bf2
parent 8d00827b1fc7d4ad1114c05319187e19527fd75c
parent 21e2e90eb89c8370971c39db85b8620e49e86ec4
author Bo Hu <bohu@google.com> 1488478407 +0000
committer android-build-merger <android-build-merger@google.com> 1488478407 +0000

Merge "DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe" am: 8c35491151  -s ours
am: 21e2e90eb8  -s ours

Change-Id: I2f4e7716ecac5d8b2d6b3ec0cfca3e37212054b9