| commit | af1b5f0dfe3928cbabc3b1c602faa642d7835272 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 24 16:12:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 16:12:08 2015 +0000 |
| tree | 66392167661adf1fd5f0c37476f58320f489ef14 | |
| parent | 0985407736ad314a089051fb28abfc78b34b29ba [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