commit | f35281147eb2c30f2bb342955f489db447629591 | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Wed Dec 14 20:30:24 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 14 20:30:25 2016 +0000 |
tree | fa1bbe37595b0238d6dd5b915ca41e0b73ab3c7f | |
parent | a0ad4a804cc82344ca6e3cbc9032e17a69119a4d [diff] | |
parent | 79a3f2cf3d6366296dcac8530a1a3d19ad8462c7 [diff] |
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" into lollipop-cts-dev am: 1dc378ce32 -s ours" into lollipop-mr1-cts-dev