| commit | ef5a4828fcdbdb8dd72309884047ed30109be03d | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Dec 14 22:16:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 22:16:42 2016 +0000 |
| tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
| parent | 8b789a21551cb31005fbfb9fabf6e6acb6d2cfe6 [diff] | |
| parent | 1e38b0bf8152e39985d1f2009bd7afd269d1c1a1 [diff] |
Merge "Merge "DO NOT MERGE: Add test to ensure media stack has no sticky SSLv3 fallback DO NOT MERGE am: 00c543d5f6 -s ours am: c85fc08468 -s ours" into lollipop-mr1-cts-dev am: e34cc0e20e -s ours" into marshmallow-cts-dev am: 646aa33eed -s ours am: 23ed5762be -s ours am: 91e2c43643 am: fdbab64d95 am: a2e0250a48 am: ec8f461727 am: 9e72342d96 am: 1e38b0bf81 -s ours Change-Id: I5ed05b7e6b28f689cdae28ffe14483991e76a942