tree 60f9c6dca4bcd6fd844678dd16923c03df2804ee
parent 21679c2a1b6fe4a1e61024343389ff7e96e58ebc
parent 99bbaff7853eab325bd87b315d532909206592b1
author Andreas Huber <andih@google.com> 1335817254 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335817254 -0700

am 99bbaff7: Merge "Make the transport stream extraction code output ADTS AAC frames." into jb-dev

* commit '99bbaff7853eab325bd87b315d532909206592b1':
  Make the transport stream extraction code output ADTS AAC frames.