OSDN Git Service

Merge "DO NOT MERGE ANYWHERE goldfish: adjust to the refactoring of qemu-pipe"
authorBo Hu <bohu@google.com>
Thu, 2 Mar 2017 18:09:29 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Mar 2017 18:09:29 +0000 (18:09 +0000)
commit1f0a0dfaedbcb6559c7387288ef19d3e950af74e
tree35b1b3c5b805e361b70026f55f038cbc034cbde2
parent78c8c0485d4d8549e797d9021fef50e155944ad1
parent2ab37f8a729d64a0e7fe6571bd9fead2a663cdb3
Merge "DO NOT MERGE ANYWHERE goldfish: adjust to the refactoring of qemu-pipe"
am: 2ab37f8a72  -s ours

Change-Id: I4d7db9f2cd1602ac772f7ca111ca95599a71af67