summaryrefslogtreecommitdiff
path: root/libs/utils/TextOutput.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-09-01 13:57:44 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-01 13:57:44 -0700
commit71c908c475aac03122bee0b764816f09a18ce8aa (patch)
treec6726f36023b308b168b52eaf941380d38d339ea /libs/utils/TextOutput.cpp
parent47f2cf620731226a9311db0f864a4e1404e54b96 (diff)
parent6c33904ad948cb64245fbc5950c839e4d9e56de3 (diff)
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.
Diffstat (limited to 'libs/utils/TextOutput.cpp')
0 files changed, 0 insertions, 0 deletions