fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
fdk-aac/libSBRenc
History
Martin Storsjo 54dfe1ec69 Merge remote-tracking branch 'aosp/jb-mr1-release' into master 
Conflicts:
	libAACenc/src/band_nrg.cpp
	libAACenc/src/grp_data.cpp
	libSBRenc/src/env_est.cpp
 		2012-11-01 11:08:03 +02:00
..
include Snapshot 2bda038c16 2012-07-11 10:15:24 -07:00
src Merge remote-tracking branch 'aosp/jb-mr1-release' into master 2012-11-01 11:08:03 +02:00