LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve merge conflicts of 1381b1d9a77260d78a3a67359e16c06ee388d37b to oc-mr1-dev-plus-aosp

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I5afdfc8e1e523768db9065dd3571cb31bc1dfac5
Change-Id: I5c5b85f516dba0d403eeee06055953931d2198aa
This commit is contained in:
Anton Hansson
2018-02-26 15:11:02 +00:00
parent df4e5f9902 fed17889c7
commit 0c02379ec1
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/cts/net/Android.mk
View File

@@ -45,6 +45,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
# uncomment when b/13249961 is fixed # uncomment when b/13249961 is fixed
#LOCAL_SDK_VERSION := current #LOCAL_SDK_VERSION := current
LOCAL_PRIVATE_PLATFORM_APIS := true
# Tag this module as a cts test artifact # Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests LOCAL_COMPATIBILITY_SUITE := cts vts general-tests