| commit | 7b06f9ba19a9945355d634ddafaaa351681b6f9b | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 24 16:06:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 16:06:16 2015 +0000 |
| tree | 2746d68470a048e6ce5b886fd9afac7351ad130b | |
| parent | 76dea1de8c92588358923300cbbc038144d302eb [diff] | |
| parent | fa11fd5bb2e9c5e00f7fecbbe76c279193182cee [diff] |
am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev * commit 'fa11fd5bb2e9c5e00f7fecbbe76c279193182cee': Prevent integer issues in ID3::Iterator::findFrame