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
tree: 62a3555429c3caf6d6220df764adf91a9ee9b991
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE