| commit | 1a3bfa5bba470303e818876c835263874d23ecc4 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Dec 14 22:29:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 22:29:25 2016 +0000 |
| tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
| parent | 13efd7eff3109e6eef770bb96831b76ccdb1e457 [diff] | |
| parent | 2a2ff94d1c8b3f02505ce03112b1a205c8daa638 [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 am: d2e4bef05e -s ours" into nyc-dev am: 9248b22280 am: c16407b2fe am: fa499976d9 am: 0ff9299086 am: af48bad163" into nyc-mr2-dev-plus-aosp am: 2a2ff94d1c -s ours Change-Id: I55a55d4d40b6ecf8b504c2d0e9886eb1d1b214d7