Merge commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e' into eclair-plus-aosp * commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e': Fix bug 2325244 screen turns black for a brief period of time
Merge commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e' into eclair-plus-aosp * commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e': Fix bug 2325244 screen turns black for a brief period of time