| commit | 1c425b65186bb64b5c5e32194b3db3df4a5378b1 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Aug 24 16:54:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 16:54:59 2015 +0000 |
| tree | 0c0cc8d19291aa40b644fb0d4b78045a0760cd80 | |
| parent | 5e5115268e3512c2b9a2a17b05328e73b86cb289 [diff] | |
| parent | b3b34074477b9f8713924e18f7a0120965112720 [diff] |
am b3b34074: am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev * commit 'b3b34074477b9f8713924e18f7a0120965112720': Prevent integer issues in ID3::Iterator::findFrame