commit | 2c8c96556ba797789b45ba2465ef892568c7312d | [log] [tgz] |
---|---|---|
author | Vladimir Chtchetkine <vchtchetkine@google.com> | Wed Aug 10 12:21:05 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 10 12:21:05 2011 -0700 |
tree | 187c3ff3ab765d761e2758f63ddf409b34e94930 | |
parent | 2cc60325243c41bfcd9c76603f03e2c8d8b7f5ab [diff] | |
parent | d8ad6c98086c410243e0e8ad8285f02d6b696bd6 [diff] |
am d8ad6c98: resolved conflicts for merge of 988d3d71 to honeycomb-plus-aosp * commit 'd8ad6c98086c410243e0e8ad8285f02d6b696bd6': Enable QEMUD pipe connection