Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer...

author James Dong <jdong@google.com>

Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)
author James Dong <jdong@google.com>
Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)
diff --cc media/libstagefright/AwesomePlayer.cpp
Simple merge
diff --cc media/libstagefright/OMXCodec.cpp
Simple merge
author	James Dong <jdong@google.com>
	Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)
		1	2
media/libstagefright/AwesomePlayer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/OMXCodec.cpp	patch \|	diff1 \|	diff2 \|	blob \| history