| commit | 34c8c74e20d952562e58ee534fe0e15e648a63d0 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Dec 14 22:54:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 22:54:58 2016 +0000 |
| tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
| parent | cb63c2c6abee6cd89a61e1a78026919bb638258a [diff] | |
| parent | 81d272c00560f61559bac2f85d78002008cd0c55 [diff] |
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 am: 1ef45e61b0 -s ours am: 697d1e6852 -s ours" into nougat-cts-dev am: 8cc868b594 -s ours" into nyc-dev am: dccc4d496c am: d94395e02e am: e5cc0c251b am: 77dc762625 am: 435204474c" into nyc-mr2-dev-plus-aosp am: 81d272c005 -s ours Change-Id: I63cf352eb4b5f795c5eb9d8fcf1de30284bf0d16