OSDN Git Service

am 2109e680: am 8c7ab034: Fixing the build, only instantiate the software aac decoder...
authorAndreas Huber <andih@google.com>
Tue, 8 Dec 2009 02:34:41 +0000 (18:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 02:34:41 +0000 (18:34 -0800)
commitdd3e79014151614a80f3f30b68cecb894502e514
tree26ebb4d2bb3cffcecbddadfc9b66eb9b0c152a39
parent26fa3dcb9d3a4fc283f543689253d71af1be5227
parent2109e6801199b10460330027f3537d406b6a0149
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.