SourceForge has been redesigned. Learn more.
Close

Commit [54dfe1]  Maximize  Restore  History

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