commit | 9bb2ae4a924cfd67803c75b7e360afb0ddf88e03 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Mon Aug 24 17:03:08 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 17:03:08 2015 +0000 |
tree | d124b735741baca55c3cb9340985703a060fb6ca | |
parent | ed926597544b0bb945fe6965d49b7612c09abc1e [diff] | |
parent | 1c425b65186bb64b5c5e32194b3db3df4a5378b1 [diff] |
am 1c425b65: am b3b34074: am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev * commit '1c425b65186bb64b5c5e32194b3db3df4a5378b1': Prevent integer issues in ID3::Iterator::findFrame