Steven Moreland 726af41e68 resolve merge conflicts of dd5206c57 to oc-mr1-dev-plus-aosp ... This version of configstore was removed internally. Test: I solemnly swear I tested this conflict resolution. Change-Id: I589addff6aec7bb7a8a7938d75c51dcc56116a42		2017-11-02 20:59:39 +00:00
..
1.0	Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1	2017-10-11 16:31:07 +00:00
1.1	resolve merge conflicts of dd5206c57 to oc-mr1-dev-plus-aosp	2017-11-02 20:59:39 +00:00
offload/1.0	resolve merge conflicts of dd5206c57 to oc-mr1-dev-plus-aosp	2017-11-02 20:59:39 +00:00
supplicant/1.0	Merge "Remove unnecessary Android.mk" am: 7052f3d45d	2017-11-02 04:24:48 +00:00
.clang-format	wifi(vts): simplify HIDL calls	2017-02-15 12:47:02 -08:00
Android.bp	Wifi supplicant test statically links to dependencies.	2017-08-04 10:36:10 -07:00