diff options
| author | Martin Storsjo <martin@martin.st> | 2012-11-01 11:08:03 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-11-01 11:08:03 +0200 |
| commit | c46af234e40a04613a4ec1ce3d194f86bd189bc5 (patch) | |
| tree | 049760d4fd5a20ce36906e313547497259d1cce7 | |
| parent | 126c308100227eb4b3142fd63a6df73c4517e243 (diff) | |
| parent | 140fc8907e0669d17adba6d814bd7525d523aa38 (diff) | |
| download | ODR-PadEnc-c46af234e40a04613a4ec1ce3d194f86bd189bc5.tar.gz ODR-PadEnc-c46af234e40a04613a4ec1ce3d194f86bd189bc5.tar.bz2 ODR-PadEnc-c46af234e40a04613a4ec1ce3d194f86bd189bc5.zip | |
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
0 files changed, 0 insertions, 0 deletions