am bc629c90: am 54dc772f: Merge "trial fix for MediaRecorderTest.testOnErrorListener" into jb-dev

* commit 'bc629c90a24cd36a75b77bbe1a9947d958a529f7':
  trial fix for MediaRecorderTest.testOnErrorListener