fat-tire/android_device_bn_encore — pull request #37 by meteorrock (2012-06-26 01:11:45+00:00)
Title: Debugging ICS main line for the nook color. 

I have been resolving merge conflicts in my diff for the main master ICS nook color line. I have been very careful with my resolves. I am resolving each file up the main line. Thank you. Each resolve is labeled from the main line commits. I have included commits about the resolves in each patch. [meteorrock]