| commit | 291e97796fb9cf07eb167579f585cf0b3c7c66d0 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Dec 14 22:53:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 22:53:21 2016 +0000 |
| tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
| parent | 2d68f95b995b26ff3698446e95de52512b12af64 [diff] | |
| parent | 4cc4058ae07258193ec9f1f996fe4633d555f1b6 [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 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: c60d2208e9" into nyc-mr2-dev-plus-aosp am: 4cc4058ae0 -s ours Change-Id: I2580579a113d18d99aaa6aa272df8134e6217e4e