Merge "Radio Interface changes to allow the modem to query the framework for the...

author Pankaj Kanwar <pkanwar@google.com>

Sun, 11 Jun 2017 18:13:01 +0000 (18:13 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Sun, 11 Jun 2017 18:13:12 +0000 (18:13 +0000)
author Pankaj Kanwar <pkanwar@google.com>
Sun, 11 Jun 2017 18:13:01 +0000 (18:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sun, 11 Jun 2017 18:13:12 +0000 (18:13 +0000)
diff --cc include/telephony/ril.h
Simple merge
diff --cc libril/ril_service.cpp
Simple merge
author	Pankaj Kanwar <pkanwar@google.com>
	Sun, 11 Jun 2017 18:13:01 +0000 (18:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sun, 11 Jun 2017 18:13:12 +0000 (18:13 +0000)
		1	2
include/telephony/ril.h	patch \|	diff1 \|	diff2 \|	blob \| history
libril/ril_service.cpp	patch \|	diff1 \|	diff2 \|	blob \| history