am dbc26a86: am 6ead6cca: Merge "Add some documentation to MediaCodecInfo" into jb-mr2-dev

* commit 'dbc26a867d0a90319b0b016f9d658d9e754d6cb2':
  Add some documentation to MediaCodecInfo