commit | 63a2a93118c01f8c5935b359a0ea80e7b86cdfae | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Wed Dec 14 22:44:03 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 22:44:03 2016 +0000 |
tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
parent | f8e798685aa556f7d4b91f507af11205fbc39eae [diff] | |
parent | 608be7016df30a5c5bd5060bb255d6895e084fbd [diff] |
Merge "Merge "Merge "DO NOT MERGE: Add test to ensure media stack has no sticky SSLv3 fallback DO NOT MERGE am: 00c543d5f6 -s ours" into lollipop-cts-dev am: 42f434ad1e -s ours" into lollipop-mr1-cts-dev am: 25a019f2df -s ours am: 9c1eef0211 -s ours" into nougat-cts-dev am: 948cd7aad6 -s ours am: b4efadaef3 am: 024d44ae7f am: 232d95d66d am: 4206dfdb14 am: a65e8d25f6 am: 608be7016d -s ours Change-Id: Ie04be6d23d9146f13dc14ffc12c5846d6b180ac3