| commit | b6166af7a4935ea42f548ec2b9c8aa7098e70f88 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 07 18:28:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 18:28:10 2015 +0000 |
| tree | 8b0e1157e443a8bb1a4a899156ba971036cfc959 | |
| parent | 67630f47356b35ba3cf25ff0cd9ffc9b91c1ac45 [diff] | |
| parent | 45b821dfa69a974f57c3ff00e1764e080fb050ea [diff] |
am 45b821df: am ef426568: am 3b7ca5d1: am efc51f0f: am 93a8df0e: am 61934faf: am 94012bc3: am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp * commit '45b821dfa69a974f57c3ff00e1764e080fb050ea': Prevent integer overflow when processing covr MPEG4 atoms