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

Bug fixes in AAC decoder, AAC encoder, FDK library

2012-09-09 11:52:09 -07:00

src

Merge remote-tracking branch 'aosp/jb-mr1-release' into master

2012-11-01 11:08:03 +02:00