tree c7f5f7820aa39c965706b7ea504d9b53f5147688
parent 1745e1e28c3a6064ebdc46921f74ec44f7f1c9fd
parent 4c9cd95b27a638701be2ffa1713273ba2f624770
author Dave Burke <daveburke@google.com> 1335815506 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335815506 -0700

am 4c9cd95b: Merge "Added support for HE-AAC recording" into jb-dev

* commit '4c9cd95b27a638701be2ffa1713273ba2f624770':
  Added support for HE-AAC recording