am f20e4ad9: am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format...
am f20e4ad9: am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
* commit 'f20e4ad9':
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h