| commit | c41a35e8e583f7c6d3742b80667be80d4a2c7efb | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 16:34:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 16:34:06 2015 +0000 |
| tree | 449745b4a9a901ce812b8fcd4cbf66f5d27c6ed1 | |
| parent | 40d6fb647647c29dfd12a5c78611eb22129490c3 [diff] | |
| parent | 80bee1ee989a9522fc58c66fc8d6c0f40d7e630e [diff] |
am 80bee1ee: resolved conflicts for f49f5d1f to stage-aosp-master * commit '80bee1ee989a9522fc58c66fc8d6c0f40d7e630e': Enable signed-integer-overflow in matroska