tree 26ebb4d2bb3cffcecbddadfc9b66eb9b0c152a39
parent 26fa3dcb9d3a4fc283f543689253d71af1be5227
parent 2109e6801199b10460330027f3537d406b6a0149
author Andreas Huber <andih@google.com> 1260239681 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260239681 -0800

am 2109e680: am 8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.

Merge commit '2109e6801199b10460330027f3537d406b6a0149'

* commit '2109e6801199b10460330027f3537d406b6a0149':
  Fixing the build, only instantiate the software aac decoder in full stagefright builds.