OSDN Git Service

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

Change-Id: I8683ef0456888f77b747144e411f146ee95a25d1