commit | 698bc40cd8fc55d48f2adc90a2856200891b6ef2 | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Mon Dec 10 08:59:47 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 08:59:47 2012 -0800 |
tree | 8f7b5362167bdd9ff8e8b1c5fb0f1fb9430b40fa | |
parent | 031e99bb4d93971488107a9b9bab5fb5ace9cd7d [diff] | |
parent | 4813868364b0b2a0a7fb2ee8369242e75ffce8fb [diff] |
am 48138683: am e22e8b80: am 2bf7a779: Merge "Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)" into jb-dev * commit '4813868364b0b2a0a7fb2ee8369242e75ffce8fb': Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)