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