OSDN Git Service

am d8ad6c98: resolved conflicts for merge of 988d3d71 to honeycomb-plus-aosp
authorVladimir Chtchetkine <vchtchetkine@google.com>
Wed, 10 Aug 2011 19:21:05 +0000 (12:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Aug 2011 19:21:05 +0000 (12:21 -0700)
* commit 'd8ad6c98086c410243e0e8ad8285f02d6b696bd6':
  Enable QEMUD pipe connection


Trivial merge