| commit | 86e78adcbc598414003539854c51359dfb8cd6d5 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Dec 14 20:50:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 20:50:24 2016 +0000 |
| tree | 0b5f565ed613699df07041b5c5c3ff189875cac6 | |
| parent | e502c0a5d0b5d8f4edd1442ab8d7537ee8b4d92e [diff] | |
| parent | 8ec102ffbf8118988d8c90b59f06f94b124cca25 [diff] |
Merge "Merge "Merge "DO NOT MERGE: Add test to ensure media stack has no sticky SSLv3 fallback DO NOT MERGE" into kitkat-cts-dev am: ea13c86803 -s ours am: a997adead8 -s ours" into lollipop-mr1-cts-dev am: a0ad4a804c -s ours" into marshmallow-cts-dev am: 8ec102ffbf -s ours Change-Id: I544e0c0b7d01cca36ef7b6bbdb9cd776283301b4