am c2182c67: Merge "Clarification of MediaCodec behaviour when codec specific...
am c2182c67: Merge "Clarification of MediaCodec behaviour when codec specific data is included" into jb-dev
* commit 'c2182c67':
Clarification of MediaCodec behaviour when codec specific data is included