Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp * commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982': Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder