| commit | 61205a3bd5b6d09b1a745162a641369c0423431f | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Thu Aug 13 06:44:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 06:44:13 2015 +0000 |
| tree | 08a37449770e80475fbf8eac4415eacdf6ecc4a7 | |
| parent | d56699a31c77933a141d7535bf3aca93bec42f3a [diff] | |
| parent | 5c4a35a9f58bd97b44e0905639b7f4f20d92cda0 [diff] |
am 5c4a35a9: resolved conflicts for merge of c1fdbd41 to mnc-dr-dev-plus-aosp * commit '5c4a35a9f58bd97b44e0905639b7f4f20d92cda0': libstagefright: fix possible overflow in amrwbenc.