tree 4a66971cc5a7b43568ac53eb760f8a6e05fd84eb
parent c5b34ec2729e17e5cfc4b61a4e1a47324d8a8142
parent a8f613283901dfbe4c06c9149930f4c923c15374
author James Dong <jdong@google.com> 1335983925 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335983925 -0700

am a8f61328: am 359f90ce: Merge "The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter." into jb-dev

* commit 'a8f613283901dfbe4c06c9149930f4c923c15374':
  The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter.