sqian 57c9e5fc37 resolve merge conflicts of ccda8d6296 to pi-dev ... Test: I solemnly swear I tested this conflict resolution. Bug: 72075328 Change-Id: I8c993cd2fa95c961dc7f976b5bd85a2826b42889		2018-07-16 21:20:47 +00:00
..
vts	resolve merge conflicts of ccda8d6296 to pi-dev	2018-07-16 21:20:47 +00:00
Android.bp	Updating makefiles for hidl_interface.	2017-11-13 10:00:18 -08:00
IRadio.hal	Add p2 option in OpenLogicalChannel	2017-04-12 17:16:50 +00:00
IRadioIndication.hal	Convert all comments into "doxygen-ready" comments.	2017-03-28 16:14:43 -07:00
IRadioResponse.hal	Add SIM_PUK2 for Icc VTS tests	2018-07-12 10:57:30 -07:00
ISap.hal	Revert "Make setResponseFunctions() and setCallback() oneway."	2017-03-21 23:09:44 +00:00
ISapCallback.hal	Minor updates to ISap hal.	2016-12-27 10:44:59 -08:00
types.hal	Fix wcdma signal strength comments	2018-03-05 20:30:18 +00:00