| commit | 13815039dc94ec231ec033ac80e106d36338d081 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 17:46:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 17:46:53 2015 +0000 |
| tree | 5d7bb104c6703e6132dcbfb5c0ab6e9df3d526fe | |
| parent | 4137d521e2be255ee109a6c59a1cd273b9029a4c [diff] | |
| parent | 683c0daa1294acaa023d976eef51850519c4cb17 [diff] |
am 683c0daa: (-s ours) am 9d46697e: Merge "resolved conflicts for c82fcdda to stage-aosp-master" into stage-aosp-master * commit '683c0daa1294acaa023d976eef51850519c4cb17': Enable signed-integer-overflow in rtsp