am 0814a9aa: am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp

* commit '0814a9aa0c8f89f084ba37df05b3735274d78420':
  NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
  Fix missing NL
This commit is contained in:
David 'Digit' Turner 2011-07-13 14:55:20 -07:00 committed by Android Git Automerger
commit a74e2aa3bc

Diff Content Not Available