summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-04-13 12:23:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-13 12:23:28 -0700
commitd760afc3b59cdeaa866261f5acc27510510d69d1 (patch)
tree63afd2874a3a2fe2348dc9126c92338790978f8e /core
parentebaa935e2dd534d46ae79091679e9c2d36710f81 (diff)
parent30e9c2d4db145e02b5312ce29606b03dd78349d3 (diff)
downloadframeworks_base-d760afc3b59cdeaa866261f5acc27510510d69d1.zip
frameworks_base-d760afc3b59cdeaa866261f5acc27510510d69d1.tar.gz
frameworks_base-d760afc3b59cdeaa866261f5acc27510510d69d1.tar.bz2
am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." in
Merge commit '30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken * commit '30e9c2d4db145e02b5312ce29606b03dd78349d3': Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions