tree 8b31ea2f976807324caea3b9cf91c0cf7a9dc5b7
parent 0bc248f9830901a047161fb9cedc9c6213cf70e0
parent dc5942840e1d1501a7ac4d633e8c5311e90c903b
author Jeff Brown <jeffbrown@google.com> 1274476121 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274476121 -0700

am dc594284: Merge "Fix kernel panics in fastboot on OS X." into kraken