tree 0647a68e25a4a6329cc0572a75dee37b8fd3dc19
parent 32aa719772ee56ee187702649e22946e018a25c1
parent 81f09d8d549c9822957ee423c74dc778dd16c32b
author Suchi Amalapurapu <asuchitra@google.com> 1271977054 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271977054 -0700

am a298d6fd: am a2a568e5: Merge "Fix error code when media is filled up." into froyo

Merge commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f' into kraken

* commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f':
  Fix error code when media is filled up.