OSDN Git Service

am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 23:15:27 +0000 (16:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Jul 2011 23:15:27 +0000 (16:15 -0700)
commit0814a9aa0c8f89f084ba37df05b3735274d78420
tree14b1a7f7afa51e6f72076ea22553a3a6bab263bd
parent9b446cd6b4d3d2c2e2517d95937750da0d3b2df1
parentdb4c5f352d6eb8e248953ccff1dbecb1270af4c5
am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp

* commit 'db4c5f352d6eb8e248953ccff1dbecb1270af4c5':
  NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
  Fix missing NL