| commit | 69bfd4e881425e2c2f0d338cb4772a00588177a1 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Wed Dec 14 22:42:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 22:42:21 2016 +0000 |
| tree | 6c2eb1859cc69f2d425faad2147d0fbfeb7ce732 | |
| parent | 52d64a6ee4f51ccae0ba48f91b70597286ab8e2c [diff] | |
| parent | 2c6317e946057eac368c9ddab4c175cd2c48b1cc [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: f9b092014e" into nyc-mr2-dev-plus-aosp am: 2c6317e946 -s ours Change-Id: Ib7cdd867f9e658037873c59acdc44ebf93686efc