tree 266058c881c2af2b88a2094d6b3ce494e8706af7
parent cc24af6ed02e23d1483097add12d0f20944e7492
parent cad86a311f295384ee1ef9d6a03e809389276b14
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