diff options
| author | Martin Storsjo <martin@martin.st> | 2013-11-01 10:46:40 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2013-11-01 10:46:40 +0200 |
| commit | 37a264c2e64b2eb9d8a59a5aeeb5b23115cd4fd1 (patch) | |
| tree | 049760d4fd5a20ce36906e313547497259d1cce7 /src | |
| parent | f7f7622ac63c19117c9c1902a886fb6679041531 (diff) | |
| parent | 140fc8907e0669d17adba6d814bd7525d523aa38 (diff) | |
| download | ODR-PadEnc-37a264c2e64b2eb9d8a59a5aeeb5b23115cd4fd1.tar.gz ODR-PadEnc-37a264c2e64b2eb9d8a59a5aeeb5b23115cd4fd1.tar.bz2 ODR-PadEnc-37a264c2e64b2eb9d8a59a5aeeb5b23115cd4fd1.zip | |
Merge remote-tracking branch 'aosp/kitkat-release' into kitkat-merge
Conflicts:
libAACenc/src/quantize.cpp
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions