| commit | f81ed0032f86ab0943baa1ad8a25de8e06498409 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Aug 16 17:40:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 17:40:06 2012 -0700 |
| tree | 17ec439e0c8c65063b892446e6f15d7851fd784a | |
| parent | 08ebb6b114c9a2700e88e669a6064c7c91cfea2e [diff] | |
| parent | f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a [diff] |
am f20e4ad9: am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h" * commit 'f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a': stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h