10b15c08bb
Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp * commit 'd6877fa4971710150de20453bf4ba54dca863429': AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.