24fa50a2e87a5f7aab5795178d303e6a168c9b5f - platform/cts

commit	24fa50a2e87a5f7aab5795178d303e6a168c9b5f	[log] [tgz]
author	Xin Li <delphij@google.com>	Wed Dec 12 13:54:12 2018 -0800
committer	Xin Li <delphij@google.com>	Wed Dec 12 13:55:47 2018 -0800
tree	ef1dad6a5ebfdf2f201905afec668acd2dd1c582
parent	90f928905c8d1ce372c6741aa81f293c76d4e224 [diff]

DO NOT MERGE: Fix mismerge.

Bug: 120502534
Change-Id: Ifdb473953a53cb9d92c8b1cf3b8371423dbe3372

hostsidetests/securitybulletin/AndroidTest.xml[diff]
hostsidetests/securitybulletin/securityPatch/CVE-2012-6702/Android.mk[Renamed from hostsidetests/security/securityPatch/CVE-2012-6702/Android.mk - diff]
hostsidetests/securitybulletin/securityPatch/CVE-2012-6702/poc.c[Renamed from hostsidetests/security/securityPatch/CVE-2012-6702/poc.c - diff]
hostsidetests/securitybulletin/securityPatch/CVE-2015-8839/Android.mk[Renamed from hostsidetests/security/securityPatch/CVE-2015-8839/Android.mk - diff]
hostsidetests/securitybulletin/securityPatch/CVE-2015-8839/poc.c[Renamed from hostsidetests/security/securityPatch/CVE-2015-8839/poc.c - diff]
hostsidetests/securitybulletin/securityPatch/CVE-2016-2062/Android.mk[Renamed from hostsidetests/security/securityPatch/CVE-2016-2062/Android.mk - diff]
hostsidetests/securitybulletin/securityPatch/CVE-2016-2062/poc.c[Renamed from hostsidetests/security/securityPatch/CVE-2016-2062/poc.c - diff]
hostsidetests/securitybulletin/securityPatch/CVE-2017-13273/Android.mk[Renamed from hostsidetests/security/securityPatch/CVE-2017-13273/Android.mk - diff]
hostsidetests/securitybulletin/securityPatch/CVE-2017-13273/poc.c[Renamed from hostsidetests/security/securityPatch/CVE-2017-13273/poc.c - diff]
hostsidetests/securitybulletin/securityPatch/CVE-2018-9424/Android.mk[Renamed from hostsidetests/security/securityPatch/CVE-2018-9424/Android.mk - diff]
hostsidetests/securitybulletin/securityPatch/CVE-2018-9424/poc.cpp[Renamed from hostsidetests/security/securityPatch/CVE-2018-9424/poc.cpp - diff]
hostsidetests/securitybulletin/src/android/security/cts/Poc16_06.java[Renamed from hostsidetests/security/src/android/security/cts/Poc16_06.java - diff]
hostsidetests/securitybulletin/src/android/security/cts/Poc16_11.java[Renamed from hostsidetests/security/src/android/security/cts/Poc16_11.java - diff]
hostsidetests/securitybulletin/src/android/security/cts/Poc18_07.java[Renamed from hostsidetests/security/src/android/security/cts/Poc18_07.java - diff]

14 files changed

tree: ef1dad6a5ebfdf2f201905afec668acd2dd1c582