| commit | a326e6885d19a6b60e1d0eb74b9fc57f71aeb1e1 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Dec 14 22:44:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 22:44:06 2016 +0000 |
| tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
| parent | 63a2a93118c01f8c5935b359a0ea80e7b86cdfae [diff] | |
| parent | fffde27e155b0a33b26b194538dd896db1bb33c9 [diff] |
Merge "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" into nyc-mr2-dev-plus-aosp am: fffde27e15 -s ours Change-Id: I16824502b27e0cdf4b7e8dc2b39922e502d78bac