am 0b2affe8: am 87d208f7: Merge "This log message is codec specific." into gingerbread

Merge commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1'

* commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1':
  This log message is codec specific.