tree 6961d6b46f1a61e96afa85e56fdf5a6844bba898
parent e2a2fe4ef3695baf3c7dca1637373ebd968a4704
parent d1e8f467602307090f36a899b47f5088d0bc0201
author Andreas Huber <andih@google.com> 1352917464 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352917464 -0800

am d1e8f467: am 99a86d06: Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content

* commit 'd1e8f467602307090f36a899b47f5088d0bc0201':
  Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content