tree c6726f36023b308b168b52eaf941380d38d339ea
parent 47f2cf620731226a9311db0f864a4e1404e54b96
parent 6c33904ad948cb64245fbc5950c839e4d9e56de3
author Andreas Huber <andih@google.com> 1283374664 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283374664 -0700

am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make sure it\'s registered in non-opencore builds." into gingerbread

Merge commit '6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp

* commit '6c33904ad948cb64245fbc5950c839e4d9e56de3':
  Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.