tree f3b50f75ce127b2c6f89675ba3bf4ea255983451
parent 28e448bb5533d14f9a2c39bd71a73e0062fc5c49
parent 1c6ab7db30867f3eee0d550adb015b340fbbc668
author Marco Nelissen <marcone@google.com> 1423619485 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423619485 +0000

am 1c6ab7db: Merge "Use gcc for the AAC decoder"

* commit '1c6ab7db30867f3eee0d550adb015b340fbbc668':
  Use gcc for the AAC decoder