diff options
author | Andreas Huber <andih@google.com> | 2010-08-31 15:02:38 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 15:02:38 -0700 |
commit | 03cf22057a9f494346b0160c1709500741741e03 (patch) | |
tree | df798c9656f8749d0e045473b1dace7194715de6 /graphics/java/android/renderscript/RenderScript.java | |
parent | 5f39972aa9cc6c620e3f6187c914082a503a0adc (diff) | |
parent | 6b52911cc7ba548fd3a240ca61eba510a8581e6f (diff) |
am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
Merge commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f'
* commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f':
Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions