1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-28 16:37:38 +01:00
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
..
2012-10-02 10:46:47 -07:00
2012-10-02 10:46:47 -07:00
2012-10-02 10:46:47 -07:00