| commit | 683c0daa1294acaa023d976eef51850519c4cb17 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 16:43:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 16:43:09 2015 +0000 |
| tree | 34aab690a766d75f08cb7a283d7b8255ba3fda4f | |
| parent | 373c7621e21f8f15b4514e719030eb9ca7ebcfe6 [diff] | |
| parent | 9d46697e3bd1af0f7150703a0b6b3ab17fa630c3 [diff] |
am 9d46697e: Merge "resolved conflicts for c82fcdda to stage-aosp-master" into stage-aosp-master * commit '9d46697e3bd1af0f7150703a0b6b3ab17fa630c3': Enable signed-integer-overflow in rtsp