tree c2830bdd4beac8b68f0a178baae7e79aa12c1dac
parent 605a80f3c3c77fefc6bcfdfd7b22f2839a76c7af
parent 0814a9aa0c8f89f084ba37df05b3735274d78420
author David 'Digit' Turner <digit@google.com> 1310594120 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310594120 -0700

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