| commit | 3092f98101991c06b0d2e33326a8b3b6af0b143b | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Nov 13 23:48:17 2017 +0100 |
| committer | Martijn Coenen <maco@google.com> | Tue Nov 14 08:37:32 2017 +0000 |
| tree | c61728dd781a485f363bdba4ebef0d004257bddb | |
| parent | a9a2b28709d4cd324e74417599c87bcb42608f53 [diff] [blame] | |
| parent | 32ba3eaadebd132204d0feb8b9e24e7d55cac710 [diff] [blame] |
resolve merge conflicts of 32ba3eaa to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I731eba80656edbf87a5d5ba3af63a2c607ac61a6 Merged-In: Id71e2348eabf5101d1fd286bbc0076154703d159
diff --git a/configstore/1.0/default/Android.mk b/configstore/1.0/default/Android.mk index 8b24031..240b2a2 100644 --- a/configstore/1.0/default/Android.mk +++ b/configstore/1.0/default/Android.mk
@@ -13,13 +13,13 @@ include $(LOCAL_PATH)/surfaceflinger.mk LOCAL_SHARED_LIBRARIES := \ - android.hardware.configstore@1.0 \ libhidlbase \ libhidltransport \ libbase \ libhwminijail \ liblog \ libutils \ + android.hardware.configstore@1.0 \ include $(BUILD_EXECUTABLE)