sqian 9a73da9161 resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp ... Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia06246656aa4ef9db0b68942402ea0264fb92b17 Merged-In: I9200fb932032e6e23a5f4401fa5698140a278d07		2017-08-02 01:11:38 +00:00
..
1.0	resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp	2017-08-02 01:11:38 +00:00
1.1	Merge "Update HIDL makefiles." am: 49dad304a5 am: 68a25d22e3	2017-07-31 19:40:02 +00:00
deprecated/1.0	Update HIDL makefiles.	2017-07-26 10:14:57 -07:00
Android.bp	Add radio 1.1 vts test folder.	2017-07-10 16:25:31 -07:00