deaa8ff1b1
Merge commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503' into gingerbread-plus-aosp * commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503': Some debugging support.