tree 999a1d3064ccc3827c80e6cf09e07788fa37bef4
parent 897e572a4358f513279ea63ae9eca08077f4f823
parent e0b77ce97ef84c47ae408e92f2afb7509a5051b6
author James Dong <jdong@google.com> 1282251745 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282251745 -0700

am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread

Merge commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118' into gingerbread-plus-aosp

* commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118':
  Make MediaWriter stop and pause return errors if necessary