| commit | 5d68c567274891af355ffc3abf32a5abaac83493 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Dec 14 23:01:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 23:01:48 2016 +0000 |
| tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
| parent | b892ebf6bff86983257d9c225d389d907bd30180 [diff] | |
| parent | bdc66ef4a4d4c827ba5c07a85e445a1b0e71347f [diff] |
Merge "Merge "Merge "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" into nougat-cts-dev am: da77c9cff3 -s ours" into nyc-dev am: e86d36d770 am: dae3a1bfd7 am: cc02a970be am: 55dace8753 am: bb32c62838" into nyc-mr2-dev-plus-aosp am: bdc66ef4a4 -s ours Change-Id: I696ae10a98a45499e58740903cbd40de14e83e59