diff options
| author | Andreas Huber <andih@google.com> | 2010-09-09 13:48:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 13:48:53 -0700 |
| commit | 1560473ec1e0f7fe63e182dd72a4beb4a1ed1c7b (patch) | |
| tree | d0e7f2ff03e4a7123ea5a6c7063d6af84c4abe96 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7e36e0c3b73445c5c6b5827bb3b64ef3f70b5101 (diff) | |
| parent | f0eab98c4ef7449eb5a5ef659cd794e0003216b3 (diff) | |
am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread
Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'
* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions