am 5f43aebc: am d8ccc313: am acbf1acf: Merge "Fix Broken MediaRecorderTest#testSetCamera" into gingerbread

* commit '5f43aebca037a165801b152ca66c11527837c93a':
  Fix Broken MediaRecorderTest#testSetCamera