| commit | 52d64a6ee4f51ccae0ba48f91b70597286ab8e2c | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Dec 14 22:42:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 22:42:19 2016 +0000 |
| tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
| parent | 0dec5d630958aab0b274ee1ec89f8ef718d63c49 [diff] | |
| parent | 2e0c88c0c322da1982af6c178030454195bca9ff [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 am: 1ef45e61b0 -s ours am: 697d1e6852 -s ours am: 2e81cf3f0e -s ours" into nyc-dev am: fd3f472107 am: 0dcd2f5a69 am: 7284acdb4d am: 6cca8bb7b7 am: f9b092014e am: 2e0c88c0c3 -s ours Change-Id: Id0b3a2b7d0d39d0bed1caf4e3f5729f7a9c42345