From: James Dong <jdong@google.com>
Date: Wed, 15 Jun 2011 00:00:49 +0000 (-0700)
Subject: Merge "Update MediaPlayer and MediaRecorder javadoc"
X-Git-Tag: android-x86-4.4-r1~6665
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=51d4cd1f39829fad9d636913c8e462335b99aed9;p=android-x86%2Fframeworks-native.git

Merge "Update MediaPlayer and MediaRecorder javadoc"
---

51d4cd1f39829fad9d636913c8e462335b99aed9