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