| commit | dde6641187e3b300dbaba5cd5a748425c1446c6e | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Dec 14 22:59:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 22:59:17 2016 +0000 |
| tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
| parent | 9b08f6046bb8498537e4f4ccd903ff49525fa788 [diff] | |
| parent | 96c8f415a1c17652accd084fe5bc2fc64445181b [diff] |
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 am: 8aa7d2639a -s ours am: ef1a1fc0b0 -s ours am: 70ede67985 am: 2511b2fffd am: ec625dd4b5 am: 524e0300ad am: fbb8cb40b9 am: 96c8f415a1 -s ours Change-Id: Ic59d09734c969ca9ade9c3dc56162ea50b1c72db