commit | bdc66ef4a4d4c827ba5c07a85e445a1b0e71347f | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Dec 14 22:17:07 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Dec 14 22:17:09 2016 +0000 |
tree | 143748cc526e906385d5f52de3747efbfdbd6a24 | |
parent | 6b2f450f8b79932ef1f18839754b60644b66efe4 [diff] | |
parent | a14003ce162263ac1718e8284307d702180416df [diff] |
Merge "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" into lollipop-mr1-cts-dev am: a0ad4a804c -s ours am: 8aa7d2639a -s ours" into nougat-cts-dev am: da77c9cff3 -s ours" into nyc-dev am: e86d36d770 am: dae3a1bfd7 am: cc02a970be am: 55dace8753 am: bb32c62838" into nyc-mr2-dev-plus-aosp