am aef4af4c: Merge "Add MEDIA_ERROR_SERVER_DIED error constant to...
am aef4af4c: Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev
* commit 'aef4af4c':
Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class