commit 51ca95dc08a411b7973b5d0626e43f8ba0753370
author Jean-Baptiste Queru <jbq@google.com> Tue Jul 12 15:03:34 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 12 15:03:34 2011 -0700
tree d6750e9636bf91d6de8ed967b7e4f13e29626272
parent f75a2ed2138cd8b74597bd57e13d12e1f0b815c2
parent 3415d411073113b44d9fcfd2b7ca7cc0d483d27c

am 3415d411: Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit '3415d411073113b44d9fcfd2b7ca7cc0d483d27c':
  pixelflinger: back-port AOSP master version.
  x86: Add vold.fstab to mount the SD card
  Assembly coded android_memset16 and android_memset32
  debuggerd: IA version
  debuggerd: Reorganize to facilitate IA commit
  Set the modes for rc.* files in /system/etc
  DBUS is not fully implemented. Disable it for now
  debuggerd: Show function names in tombstone backtraces