tree 05e7e874d0a7cccb94e1bba22a43039cb554e422
parent 6a6a3f2c17ec01eca28d573c70a6844dcf8d9663
parent c863521147c0fdf8497a10430f85c306e60f2084
author Lalit Kansara <lkansara@codeaurora.org> 1481015769 +0530
committer Lalit Kansara <lkansara@codeaurora.org> 1481015769 +0530

Merge commit 'c863521147c0fdf8497a10430f85c306e60f2084' into remote

Conflicts:
	include/telephony/ril.h
	libril/ril.cpp
	libril/ril_commands.h
	libril/ril_unsol_commands.h

Change-Id: Ic2086de853e7425dcedf5db69341e8b51509a2bf